diff options
| author | Michael Gray <michael.gray@lantisproject.com> | 2018-05-29 19:43:48 +1000 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-01 21:03:27 +0200 |
| commit | 0037b1348015386adaf42f113b4282d60346d2b6 (patch) | |
| tree | 7d7f3dcffdef30455525115979b9a1dbf67b59fe /target/linux/mvebu/files-4.14/arch/arm | |
| parent | dd49c62611f822d69a799cf823f174f114120c2a (diff) | |
| download | upstream-0037b1348015386adaf42f113b4282d60346d2b6.tar.gz upstream-0037b1348015386adaf42f113b4282d60346d2b6.tar.bz2 upstream-0037b1348015386adaf42f113b4282d60346d2b6.zip | |
mvebu: fix broken console on WRT32X (venom)
The console bootarg is being corrupted on boot, causing various issues
including broken sysupgrade.
Utilising the bootargs mangle patch from other targets, hardcode the console
arguments and fetch the rootfs from the bootloader.
Kernel command line: console=ttyS0,115200 root=/dev/mtdblock8
Bootloader command line (ignored): console= root=/dev/mtdblock8
Please cherry pick to 18.06 too
Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
(cherry picked from commit 4fdc6ca31bda4aad2a65b8460b0caa5c60f87f41)
Diffstat (limited to 'target/linux/mvebu/files-4.14/arch/arm')
| -rw-r--r-- | target/linux/mvebu/files-4.14/arch/arm/boot/dts/armada-385-linksys-venom.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/target/linux/mvebu/files-4.14/arch/arm/boot/dts/armada-385-linksys-venom.dts b/target/linux/mvebu/files-4.14/arch/arm/boot/dts/armada-385-linksys-venom.dts index ea44c8f0d2..00a4ee9f39 100644 --- a/target/linux/mvebu/files-4.14/arch/arm/boot/dts/armada-385-linksys-venom.dts +++ b/target/linux/mvebu/files-4.14/arch/arm/boot/dts/armada-385-linksys-venom.dts @@ -46,7 +46,13 @@ model = "Linksys WRT32X"; compatible = "linksys,venom", "linksys,armada385", "marvell,armada385", "marvell,armada380"; + + chosen { + bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + append-rootblock = "root=/dev/mtdblock"; }; +}; &expander0 { wan_amber@0 { |