Improved efikamx's stuff. Now using Makefile rules for patterns to create boot scripts

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index 2ffc5b9a8b327002db32ae7294a9faeae9726063..0f0e36bc27dd0c7b6bf009da3ee8ebd4febd7703 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)
@@ -9,9 +9,11 @@ ZIMAGE = $(PWD)/../../../kernel/efikamx/work/zImage
 INITRDGZ = $(PWD)/../../../initrd/work/initrd.gz
 INITRAMFS = $(PWD)/../../../initramfs/work/initramfs
 
-RAMDISK_TYPE = uInitrd # select between uInitramfs or uInitrd
+RAMDISK_TYPE = uInitrd
+#RAMDISK_TYPE = uInitramfs
 
-CONSOLE = tty0 # tty0 / ttymxc0,115200
+CONSOLE_DEVICE = tty0
+#CONSOLE_DEVICE = ttymxc0,115200
 
 .PHONY: all clean distclean kernel ramdisk bootscr
 
@@ -58,31 +60,28 @@ ramdisk: $(RAMDISK_TYPE)
 
 ramdisk-clean: uInitrd-clean uInitramfs-clean
 
-templates: $(PWD)/boot-ramdisk.script $(PWD)/boot-sda.script $(PWD)/boot-mmc.script
-       sed -e "s|#RAMDISK_TYPE#|$(RAMDISK_TYPE)|" -e "s|#CONSOLE#|$(CONSOLE)|" \
-        $(PWD)/boot-ramdisk.script > $(WORK)/boot-ramdisk.script
-       sed "s|#CONSOLE#|$(CONSOLE)|" $(PWD)/boot-sda.script > $(WORK)/boot-sda.script
-       sed "s|#CONSOLE#|$(CONSOLE)|" $(PWD)/boot-mmc.script > $(WORK)/boot-mmc.script
+$(WORK)/%.script: %.script.in
+       sed -e "s|@@RAMDISK_TYPE@@|$(RAMDISK_TYPE)|" -e "s|@@CONSOLE_DEVICE@@|$(CONSOLE_DEVICE)|" $< > $@
 
-$(WORK)/boot-ramdisk.scr: $(WORK) $(MKIMAGE)
+$(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)
+$(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 $(WORK)/boot-sda.script \
        $(WORK)/boot-sda.scr
 
-$(WORK)/boot-mmc.scr: $(WORK) $(MKIMAGE)
+$(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 $(WORK)/boot-mmc.script \
        $(WORK)/boot-mmc.scr
 
-bootscr: templates $(WORK)/boot-ramdisk.scr $(WORK)/boot-sda.scr $(WORK)/boot-mmc.scr
+bootscr: $(WORK)/boot-ramdisk.scr $(WORK)/boot-sda.scr $(WORK)/boot-mmc.scr
 
 bootscr-clean:
        rm -f $(WORK)/boot-*.scr*

diff --git a/devices/efikamx/boot-sda.script b/devices/efikamx/boot-mmc.script.in
similarity index 59%
rename from devices/efikamx/boot-sda.script
rename to devices/efikamx/boot-mmc.script.in
index 019a1da210832565e35f1058ef58982ac68021c5..538ae71f825a11e3ae5479b17381336e2e1d11b4 100644 (file)
--- a/devices/efikamx/boot-sda.script
+++ b/devices/efikamx/boot-mmc.script.in
@@ -1,5 +1,5 @@
 setenv kernel uImage;
-setenv bootargs console=#CONSOLE# root=/dev/sda1 rootwait ro;
+setenv bootargs console=@@CONSOLE_DEVICE@@ root=/dev/mmcblk0p2 rootwait ro;
 ${loadcmd} ${kerneladdr} ${kernel}
 if imi ${kerneladdr}; then
   bootm ${kerneladdr}

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

diff --git a/devices/efikamx/boot-mmc.script b/devices/efikamx/boot-sda.script.in
similarity index 60%
rename from devices/efikamx/boot-mmc.script
rename to devices/efikamx/boot-sda.script.in
index 7f60ee3f15c937b0f3266fc4ff09e9993e751fcb..b56aabfc576c4f942230c134aea1d0ac8b2dff92 100644 (file)
--- a/devices/efikamx/boot-mmc.script
+++ b/devices/efikamx/boot-sda.script.in
@@ -1,5 +1,5 @@
 setenv kernel uImage;
-setenv bootargs console=#CONSOLE# root=/dev/mmcblk0p2 rootwait ro;
+setenv bootargs console=@@CONSOLE_DEVICE@@ root=/dev/sda1 rootwait ro;
 ${loadcmd} ${kerneladdr} ${kernel}
 if imi ${kerneladdr}; then
   bootm ${kerneladdr}