From 75a2f52bf62637b56770c4f4c8cc73c782f82c84 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Thu, 18 Oct 2012 18:57:51 +0000
Subject: [PATCH] Added console option by template. Updated scripts with this
 template and last Efikamx kernel version.

---
 devices/efikamx/Makefile            | 4 +++-
 devices/efikamx/boot-mmc.script     | 2 +-
 devices/efikamx/boot-ramdisk.script | 2 +-
 devices/efikamx/boot-sda.script     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/devices/efikamx/Makefile b/devices/efikamx/Makefile
index fdbb545..ef82158 100644
--- a/devices/efikamx/Makefile
+++ b/devices/efikamx/Makefile
@@ -11,6 +11,8 @@ INITRAMFS = $(PWD)/../../../initramfs/work/initramfs
 
 RAMDISK_TYPE = uInitrd # select between uInitramfs or uInitrd
 
+CONSOLE = tty0 # tty0 / ttymxc0,115200
+
 .PHONY: all clean distclean kernel ramdisk bootscr
 
 all: kernel ramdisk bootscr
@@ -24,7 +26,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
diff --git a/devices/efikamx/boot-mmc.script b/devices/efikamx/boot-mmc.script
index 00a3810..7f60ee3 100644
--- a/devices/efikamx/boot-mmc.script
+++ b/devices/efikamx/boot-mmc.script
@@ -1,5 +1,5 @@
 setenv kernel uImage;
-setenv bootargs console=ttymxc0,115200 root=/dev/mmcblk0p2 console=tty1 rootwait ro;
+setenv bootargs console=#CONSOLE# 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
index a7f1749..a7351cb 100644
--- a/devices/efikamx/boot-ramdisk.script
+++ b/devices/efikamx/boot-ramdisk.script
@@ -1,6 +1,6 @@
 setenv ramdisk #RAMDISK_TYPE#;
 setenv kernel uImage;
-setenv bootargs console=ttymxc0,115200 root=/dev/ram0 console=tty1 rootwait ro;
+setenv bootargs console=#CONSOLE# root=/dev/ram0 rootwait ro;
 ${loadcmd} ${ramdiskaddr} ${ramdisk};
 if imi ${ramdiskaddr}; then; else
   setenv bootargs ${bootargs} noinitrd;
diff --git a/devices/efikamx/boot-sda.script b/devices/efikamx/boot-sda.script
index 0753d69..019a1da 100644
--- a/devices/efikamx/boot-sda.script
+++ b/devices/efikamx/boot-sda.script
@@ -1,5 +1,5 @@
 setenv kernel uImage;
-setenv bootargs console=ttymxc0,115200 root=/dev/sda1 console=tty1 rootwait ro;
+setenv bootargs console=#CONSOLE# root=/dev/sda1 rootwait ro;
 ${loadcmd} ${kerneladdr} ${kernel}
 if imi ${kerneladdr}; then
   bootm ${kerneladdr}
-- 
2.26.2