From b7bb176d1c1865b5cf443f72aae9b9c8999d0cd2 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 25 Oct 2021 01:48:17 +0200 Subject: [PATCH] pistachio: Take bootargs from device tree The boot arguments are copied into the device tree by the boot loader and taken from the device tree by the kernel. The code which takes the boot arguments from the different sources was reworked with kernel 5.5. We have to activate CONFIG_MIPS_CMDLINE_DTB_EXTEND to take the boot arguments from the device tree. This makes the system boot on the board again. Signed-off-by: Hauke Mehrtens --- target/linux/pistachio/config-5.10 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/pistachio/config-5.10 b/target/linux/pistachio/config-5.10 index f510b389a8..f3042b1d32 100644 --- a/target/linux/pistachio/config-5.10 +++ b/target/linux/pistachio/config-5.10 @@ -141,8 +141,8 @@ CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 CONFIG_MIPS_CLOCK_VSYSCALL=y CONFIG_MIPS_CM=y -# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set -CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y +CONFIG_MIPS_CMDLINE_DTB_EXTEND=y +# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set # CONFIG_MIPS_CMDLINE_FROM_DTB is not set CONFIG_MIPS_CPC=y CONFIG_MIPS_CPS=y -- 2.30.2