[openwrt/openwrt] bcm27xx: correct cmdline.txt consoles for procd

LEDE Commits lede-commits at lists.infradead.org
Wed May 1 11:23:55 PDT 2024


noltari pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6a05d849e1f8e9b3a879cdf4113afd88ebc0678a

commit 6a05d849e1f8e9b3a879cdf4113afd88ebc0678a
Author: Elbert Mai <code at elbertmai.com>
AuthorDate: Mon Apr 29 14:05:27 2024 -0700

    bcm27xx: correct cmdline.txt consoles for procd
    
    Commit [ca8c30208d5e][1] updates procd to handle muliple "console=" on the
    kernel command line. This affects Raspberry Pi builds because cmdline.txt
    specifies a UART console and a virtual console on HDMI, in that order.
    
    When procd finds multiple consoles on the command line, it attempts to
    open /dev/console. Linux uses the [last console][2] for /dev/console, so
    procd opens the virtual console on Raspberry Pi. This completely disables
    the UART console and causes [strange behavior][3] on the virtual console.
    Prior to ca8c30208d5e, procd would always open the first console, which is
    the UART console.
    
    The simplest fix without reverting ca8c30208d5e is to swap the order of
    console options in cmdline.txt. By putting the UART console last, procd
    handles the serial console correctly as before.
    
    [1]: https://git.openwrt.org/?p=project/procd.git;a=commit;h=ca8c30208d5e1aaa2c0e3f732c4c9944735e9850
    [2]: https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html
    [3]: https://forum.openwrt.org/t/rasberry-pi-4-model-b-keyboards-gone-wild/195594
    
    Signed-off-by: Elbert Mai <code at elbertmai.com>
---
 target/linux/bcm27xx/image/cmdline.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/bcm27xx/image/cmdline.txt b/target/linux/bcm27xx/image/cmdline.txt
index 41f76f10af..bdd1e59a09 100644
--- a/target/linux/bcm27xx/image/cmdline.txt
+++ b/target/linux/bcm27xx/image/cmdline.txt
@@ -1 +1 @@
-console=serial0,115200 console=tty1 root=@ROOT@ rootfstype=squashfs,ext4 rootwait
+console=tty1 console=serial0,115200 root=@ROOT@ rootfstype=squashfs,ext4 rootwait




More information about the lede-commits mailing list