From fcc2c77af297a972d0bfc689db7cb58276c6c840 Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Sat, 30 Jul 2011 13:14:00 +0200 Subject: [PATCH] ramdisk: For MKEMBED, skip ext2, achi, and acpi --- drivers/ramdisk/Makefile | 24 +++++++++++++++++------- drivers/ramdisk/proto.embed | 33 +++++++++++++++++++++++++++++++++ drivers/ramdisk/proto.sh | 7 ++++--- 3 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 drivers/ramdisk/proto.embed diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile index 151d4bae1..6edb431ce 100644 --- a/drivers/ramdisk/Makefile +++ b/drivers/ramdisk/Makefile @@ -2,13 +2,23 @@ .include -PROGRAMS=ahci at_wini bios_wini cdprobe dev2name floppy loadramdisk mount \ - pci procfs sh service sysenv mfs ext2 +PROGRAMS= at_wini bios_wini cdprobe dev2name floppy loadramdisk mount \ + pci procfs sh service sysenv mfs SCRIPTS=newroot -# acpi is not compiled with ack -.if ${COMPILER_TYPE} == "gnu" -PROGRAMS += acpi +.if ${MKEMBED} != "yes" +PROGRAMS+= ahci ext2 +.endif + +# acpi is not compiled with ack or if MKEMBED +.if ${COMPILER_TYPE} == "gnu" && ${MKEMBED} != "yes" +PROGRAMS+= acpi +.endif + +.if ${MKEMBED} != "yes" +PROTO= proto +.else +PROTO= proto.embed .endif .if ${OBJECT_FMT} == "a.out" @@ -146,8 +156,8 @@ passwd: ../../etc/passwd rs.single: ../../etc/rs.single install ${STRIPFLAG} ../../etc/$@ $@ -proto.gen: $(PROGRAMS) $(SCRIPTS) proto.sh proto - sh -e proto.sh >proto.gen +proto.gen: $(PROGRAMS) $(SCRIPTS) proto.sh ${PROTO} + sh -e proto.sh ${PROTO} >proto.gen .if ${OBJECT_FMT} == "ELF" proto.gen: elfstrip diff --git a/drivers/ramdisk/proto.embed b/drivers/ramdisk/proto.embed new file mode 100644 index 000000000..8aff571e2 --- /dev/null +++ b/drivers/ramdisk/proto.embed @@ -0,0 +1,33 @@ +boot +640 440 +d--755 0 0 + bin d--755 0 0 + cdprobe ---755 0 0 cdprobe + dev2name ---755 0 0 dev2name + loadramdisk ---755 0 0 loadramdisk + mount ---755 0 0 mount + newroot ---755 0 0 newroot + sh ---755 0 0 sh + service ---755 0 0 service + sysenv ---755 0 0 sysenv + $ + sbin d--755 0 0 + @ACPI@ + at_wini ---755 0 0 at_wini + bios_wini ---755 0 0 bios_wini + floppy ---755 0 0 floppy + pci ---755 0 0 pci + mfs ---755 0 0 mfs + procfs ---755 0 0 procfs + $ + dev d--755 0 0 +@DEV@ + $ + etc d--755 0 0 + system.conf ---644 0 0 system.conf + mtab ---644 0 0 mtab + passwd ---644 0 0 passwd + rc ---755 0 0 rc + rs.single ---755 0 0 rs.single + $ +$ diff --git a/drivers/ramdisk/proto.sh b/drivers/ramdisk/proto.sh index b44eac149..3ed5ce691 100644 --- a/drivers/ramdisk/proto.sh +++ b/drivers/ramdisk/proto.sh @@ -3,12 +3,13 @@ set -e PATH=/bin:/sbin:/usr/bin:/usr/sbin -sed -n '1,/@ACPI/p'