X-Git-Url: http://gitweb/?a=blobdiff_plain;f=devices%2Fefikamx%2FMakefile;h=0f0e36bc27dd0c7b6bf009da3ee8ebd4febd7703;hb=ec872f037e4f576dcfc183ada84ada3b85fcbb3d;hp=fdbb545d724da725e30b716bfeb2ea1b8da12992;hpb=b253990ebffbb6db27a147f2c1c58180513fa675;p=bootloader.git

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index fdbb545..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,7 +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_DEVICE = tty0
+#CONSOLE_DEVICE = ttymxc0,115200
 
 .PHONY: all clean distclean kernel ramdisk bootscr
 
@@ -24,7 +28,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 +60,25 @@ 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)|" $< > $@
+
+$(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