aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-14 20:48:14 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-14 20:48:14 +0000
commitf08b157a49b99b69b355ac7e98b558a2f7bf54bf (patch)
tree49245665db55cc6e6a7ec40310cb45a5b8e71a2f
parentea8a989f3d06455b23999b283bdeb997f52f5ba3 (diff)
downloadmaster-187ad058-f08b157a49b99b69b355ac7e98b558a2f7bf54bf.tar.gz
master-187ad058-f08b157a49b99b69b355ac7e98b558a2f7bf54bf.tar.bz2
master-187ad058-f08b157a49b99b69b355ac7e98b558a2f7bf54bf.zip
brcm2708: force uart as the default console for procd and remove nonexistent console
procd gets last console from cmdline, so swapping tty1 (framebuffer) and ttyAMA0 (uart) is enough to force procd output via uart Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44448 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm2708/base-files/etc/inittab1
-rw-r--r--target/linux/brcm2708/image/cmdline.txt2
2 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/brcm2708/base-files/etc/inittab b/target/linux/brcm2708/base-files/etc/inittab
index d9d571e8d9..c05c5551bc 100644
--- a/target/linux/brcm2708/base-files/etc/inittab
+++ b/target/linux/brcm2708/base-files/etc/inittab
@@ -1,5 +1,4 @@
::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K shutdown
-tts/0::askfirst:/bin/ash --login
ttyAMA0::askfirst:/bin/ash --login
tty1::askfirst:/bin/ash --login
diff --git a/target/linux/brcm2708/image/cmdline.txt b/target/linux/brcm2708/image/cmdline.txt
index 516f2706b2..95848bb293 100644
--- a/target/linux/brcm2708/image/cmdline.txt
+++ b/target/linux/brcm2708/image/cmdline.txt
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 rpitestmode=1 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+dwc_otg.lpm_enable=0 rpitestmode=1 console=tty1 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait