From: Jose V Beneyto <sepen@crux.nu>
Date: Tue, 27 Aug 2013 13:43:53 +0000 (+0000)
Subject: Improved efikamx's stuff. Now using Makefile rules for patterns to create boot scripts
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=ec872f037e4f576dcfc183ada84ada3b85fcbb3d;p=bootloader.git

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 2ffc5b9..0f0e36b 100644
--- 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 019a1da..538ae71 100644
--- 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 a7351cb..54b7785 100644
--- 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 7f60ee3..b56aabf 100644
--- 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}