Cleanup and fixed issues with boot templates

[bootloader.git] / devices / cubox / Makefile

diff --git a/devices/cubox/Makefile b/devices/cubox/Makefile
index f532e3227a48496c695aefd1162a568085025de3..292ca2eca0794187a9786a45e35449b3ba66066a 100644 (file)
--- a/devices/cubox/Makefile
+++ b/devices/cubox/Makefile
@@ -1,5 +1,5 @@
 #
-# uboot/devices/efikamx/Makefile
+# bootloader/devices/cubox/Makefile
 #
 
 PWD = $(shell pwd)
@@ -8,6 +8,15 @@ MKIMAGE = $(PWD)/../../work/mkimage
 ZIMAGE = $(PWD)/../../../kernel/cubox/work/zImage
 INITRDGZ = $(PWD)/../../../initrd/work/initrd-hardfp.gz
 
+KERNEL_VERSION_STRING = $(shell readlink $(ZIMAGE) | sed s/zImage-//)
+
+RAMDISK_TYPE = uInitrd
+#RAMDISK_TYPE = uInitramfs
+
+CONSOLE_DEVICE = tty0
+#CONSOLE_DEVICE = ttymxc0,115200
+
+
 .PHONY: all clean distclean uImage uInitrd bootscr
 
 all: uImage uInitrd bootscr
@@ -21,7 +30,7 @@ $(WORK):
 
 $(WORK)/uImage: $(WORK) $(MKIMAGE) $(ZIMAGE)
        $(MKIMAGE) -A arm -O linux -a 0x1a000000 -e 0x1a000000 \
-       -T kernel -C none -n "Linux-3.5.3-cubox" \
+       -T kernel -C none -n "Linux-$(KERNEL_VERSION_STRING)" \
        -d $(ZIMAGE) $(WORK)/uImage
 
 uImage: $(WORK)/uImage
@@ -39,15 +48,17 @@ uInitrd: $(WORK)/uInitrd
 uInitrd-clean:
        rm -f $(WORK)/uInitrd
 
+
+
 $(WORK)/boot-ram.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-ram.script
        $(MKIMAGE) -A arm -O linux -a 0 -e 0 \
-       -T script -C none -n "CuBox Boot Script (ram)" \
+       -T script -C none -n "CuBox Boot Script (ramdisk)" \
        -d $(PWD)/boot-ram.script \
        $(WORK)/boot-ram.scr
 
 $(WORK)/boot-mmcblk.scr: $(WORK) $(MKIMAGE) $(PWD)/boot-mmcblk.script
        $(MKIMAGE) -A arm -O linux -a 0 -e 0 \
-       -T script -C none -n "CuBox Boot Script (mmcblk)" \
+       -T script -C none -n "CuBox Boot Script (mmc)" \
        -d $(PWD)/boot-mmcblk.script \
        $(WORK)/boot-mmcblk.scr