From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 10 Jan 2015 18:48:14 +0000 (+0000)
Subject: ar71xx: fix console string in images
X-Git-Tag: v19.07.0-rc1~15401
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=547ab2de5ad1bebaed94937b6f13e64da46dd6b2;p=openwrt%2Fstaging%2Fhauke.git

ar71xx: fix console string in images

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43917
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 2e361f3e4e..ef52f460a2 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -13,7 +13,7 @@ JFFS2_BLOCKSIZE = 64k 128k 256k
 
 KERNEL_LOADADDR = 0x80060000
 
-DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID
+DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE
 
 define Build/netgear-squashfs
 	rm -rf $@.fs $@.squashfs
@@ -53,7 +53,8 @@ define Device/Default
   IMAGES := sysupgrade.bin
   BLOCKSIZE := 64k
   FILESYSTEMS = $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-$$(BLOCKSIZE)
-  CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS))
+  CONSOLE = ttyS0,115200
+  CMDLINE = $$(if $$(BOARDNAME),board=$$(BOARDNAME)) $$(if $$(MTDPARTS),mtdparts=$$(MTDPARTS)) $$(if $$(CONSOLE),console=$$(CONSOLE))
   KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
   IMAGES := sysupgrade.bin
   IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
@@ -62,6 +63,7 @@ endef
 define Device/carambola2
   BOARDNAME = CARAMBOLA2
   IMAGE_SIZE = 16000k
+  CONSOLE = ttyATH0,115200
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
 endef
 TARGET_DEVICES += carambola2