Fixed problems when booting from initramfs

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index 3c51a83b90ada80d2307277f314e417a3be2c3eb..ffd5055353f864a0c4bf1a26001b2ca1ff1229f4 100644 (file)
--- a/devices/efikamx/Makefile
+++ b/devices/efikamx/Makefile
@@ -7,7 +7,7 @@ WORK = $(PWD)/work
 MKIMAGE = $(PWD)/../../work/mkimage
 ZIMAGE = $(PWD)/../../../kernel/efikamx/work/zImage
 INITRDGZ = $(PWD)/../../../initrd/work/initrd.gz
-INITRAMFS = $(PWD)/../../../initramfs/work/initramfs.cpio.gz
+INITRAMFS = $(PWD)/../../../initramfs/work/initramfs.cpio
 
 RAMDISK_TYPE = uInitrd
 #RAMDISK_TYPE = uInitramfs
@@ -15,6 +15,13 @@ RAMDISK_TYPE = uInitrd
 CONSOLE_DEVICE = tty0
 #CONSOLE_DEVICE = ttymxc0,115200
 
+ifeq ($(RAMDISK_TYPE), uInitrd)
+ROOT_DEVICE_PARAMS = root=/dev/ram0 rootwait ro
+else
+ROOT_DEVICE_PARAMS =
+endif
+
+
 .PHONY: all clean distclean kernel ramdisk bootscr
 
 all: kernel ramdisk bootscr
@@ -61,7 +68,9 @@ ramdisk: $(RAMDISK_TYPE)
 ramdisk-clean: uInitrd-clean uInitramfs-clean
 
 $(WORK)/%.script: %.script.in
-       sed -e "s|@@RAMDISK_TYPE@@|$(RAMDISK_TYPE)|" -e "s|@@CONSOLE_DEVICE@@|$(CONSOLE_DEVICE)|" $< > $@
+       sed -e "s|@@RAMDISK_TYPE@@|$(RAMDISK_TYPE)|" \
+               -e "s|@@CONSOLE_DEVICE@@|$(CONSOLE_DEVICE)|" \
+               -e "s|@@ROOT_DEVICE_PARAMS@@|$(ROOT_DEVICE_PARAMS)|" $< > $@
 
 $(WORK)/boot-ramdisk.scr: $(WORK)/boot-ramdisk.script $(MKIMAGE)
        $(MKIMAGE) -A arm -O linux -a 0 -e 0 \

diff --git a/devices/efikamx/boot-ramdisk.script.in b/devices/efikamx/boot-ramdisk.script.in
index 54b7785e37fc3b58fdccbd27e82c634fb4700a3e..2517b23017869296ba23efa4d0635b7af51b041c 100644 (file)
--- a/devices/efikamx/boot-ramdisk.script.in
+++ b/devices/efikamx/boot-ramdisk.script.in
@@ -1,6 +1,6 @@
 setenv ramdisk @@RAMDISK_TYPE@@;
 setenv kernel uImage;
-setenv bootargs console=@@CONSOLE_DEVICE@@ root=/dev/ram0 rootwait ro;
+setenv bootargs console=@@CONSOLE_DEVICE@@ @@ROOT_DEVICE_PARAMS@@;
 ${loadcmd} ${ramdiskaddr} ${ramdisk};
 if imi ${ramdiskaddr}; then; else
   setenv bootargs ${bootargs} noinitrd;