diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-01-10 18:48:14 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-10 18:48:14 +0000 |
commit | f717da4878bf4842fc0a9bfc0ae36842d0520a65 (patch) | |
tree | ca9e205889dc2afabe860fe688218ab739213dad /target/linux | |
parent | a9d45da16cfefc3ef1323d49468c417bb2e9cf33 (diff) | |
download | upstream-f717da4878bf4842fc0a9bfc0ae36842d0520a65.tar.gz upstream-f717da4878bf4842fc0a9bfc0ae36842d0520a65.tar.bz2 upstream-f717da4878bf4842fc0a9bfc0ae36842d0520a65.zip |
ar71xx: fix console string in images
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43917 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/ar71xx/image/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
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 |