Added 'rootwait ro' as ROOT_DEVICE_PARAMS for uInitramfs on efikamx devices

[bootloader.git] / devices / efikamx / Makefile

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index fdbb545d724da725e30b716bfeb2ea1b8da12992..cbf870dbabf1daa4e3137605029ce633b115da23 100644 (file)
--- a/devices/efikamx/Makefile
+++ b/devices/efikamx/Makefile
@@ -1,5 +1,5 @@
 #
-# uboot/devices/efikamx/Makefile
+# bootloader/devices/efikamx/Makefile
 #
 
 PWD = $(shell pwd)
@@ -7,9 +7,20 @@ WORK = $(PWD)/work
 MKIMAGE = $(PWD)/../../work/mkimage
 ZIMAGE = $(PWD)/../../../kernel/efikamx/work/zImage
 INITRDGZ = $(PWD)/../../../initrd/work/initrd.gz
-INITRAMFS = $(PWD)/../../../initramfs/work/initramfs
+INITRAMFS = $(PWD)/../../../initramfs/work/initramfs.cpio
+
+RAMDISK_TYPE = uInitrd
+#RAMDISK_TYPE = uInitramfs
+
+CONSOLE_DEVICE = tty0
+#CONSOLE_DEVICE = ttymxc0,115200
+
+ifeq ($(RAMDISK_TYPE), uInitrd)
+ROOT_DEVICE_PARAMS = root=/dev/ram0 rootwait ro
+else
+ROOT_DEVICE_PARAMS = rootwait ro
+endif
 
-RAMDISK_TYPE = uInitrd # select between uInitramfs or uInitrd
 
 .PHONY: all clean distclean kernel ramdisk bootscr
 
@@ -24,7 +35,7 @@ $(WORK):
 
 $(WORK)/uImage: $(WORK) $(MKIMAGE) $(ZIMAGE)
        $(MKIMAGE) -A arm -O linux -a 0x90008000 -e 0x90008000 \
-       -T kernel -C none -n "Linux-2.6.31.14.22-efikamx" \
+       -T kernel -C none -n "Linux-2.6.31.14.27-efikamx" \
        -d $(ZIMAGE) $(WORK)/uImage
 
 kernel: $(WORK)/uImage
@@ -56,24 +67,27 @@ ramdisk: $(RAMDISK_TYPE)
 
 ramdisk-clean: uInitrd-clean uInitramfs-clean
 
-$(WORK)/boot-ramdisk.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-ramdisk.script
-       sed -e "s|#RAMDISK_TYPE#|$(RAMDISK_TYPE)|" \
-               $(PWD)/boot-ramdisk.script > $(WORK)/boot-ramdisk.script
+$(WORK)/%.script: %.script.in
+       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 \
        -T script -C none -n "EfikaMX Boot Script (ramdisk)" \
        -d $(WORK)/boot-ramdisk.script \
        $(WORK)/boot-ramdisk.scr
 
-$(WORK)/boot-sda.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-sda.script
+$(WORK)/boot-sda.scr: $(WORK)/boot-sda.script $(MKIMAGE)
        $(MKIMAGE) -A arm -O linux -a 0 -e 0 \
        -T script -C none -n "EfikaMX Boot Script (sda)" \
-       -d $(PWD)/boot-sda.script \
+       -d $(WORK)/boot-sda.script \
        $(WORK)/boot-sda.scr
 
-$(WORK)/boot-mmc.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-mmc.script
+$(WORK)/boot-mmc.scr: $(WORK)/boot-mmc.script $(MKIMAGE)
        $(MKIMAGE) -A arm -O linux -a 0 -e 0 \
        -T script -C none -n "EfikaMX Boot Script (mmc)" \
-       -d $(PWD)/boot-mmc.script \
+       -d $(WORK)/boot-mmc.script \
        $(WORK)/boot-mmc.scr
 
 bootscr: $(WORK)/boot-ramdisk.scr $(WORK)/boot-sda.scr $(WORK)/boot-mmc.scr