From: Victor Martinez <pitillo@ono.com>
Date: Sat, 20 Oct 2012 16:20:57 +0000 (+0000)
Subject: Fixed console option problem with the template.
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=72e0271d3122533a98d2722c8d2de41502e95b20;p=bootloader.git

Fixed console option problem with the template.
---

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index ef82158..2ffc5b9 100644
--- a/devices/efikamx/Makefile
+++ b/devices/efikamx/Makefile
@@ -58,27 +58,31 @@ 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
+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)/boot-ramdisk.scr: $(WORK) $(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) $(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) $(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
+bootscr: templates $(WORK)/boot-ramdisk.scr $(WORK)/boot-sda.scr $(WORK)/boot-mmc.scr
 
 bootscr-clean:
 	rm -f $(WORK)/boot-*.scr*