From: Geert Uytterhoeven Date: Tue, 27 Sep 2022 13:26:26 +0000 (+0200) Subject: ARM: Drop CMDLINE_FORCE dependency on !ARCH_MULTIPLATFORM X-Git-Tag: v6.1-rc1~153^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502647105a1d0302d5fc32814da45bb4772becda;p=thirdparty%2Flinux.git ARM: Drop CMDLINE_FORCE dependency on !ARCH_MULTIPLATFORM On older platforms that boot an image with an appended DTB, or where the boot loader has no support for updating chosen/bootargs, it is common to rely on CMDLINE_FORCE. While a fixed command line can make the kernel unbootable on other platforms, it is not guaranteed to cause that. E.g. all Renesas boards use the same chosen/bootargs in upstream DTS, which works fine if your DHCP server hands out proper nfsroot parameters. Fixes: 84fc863606239d8b ("ARM: make ARCH_MULTIPLATFORM user-visible") Signed-off-by: Geert Uytterhoeven Acked-by: Ard Biesheuvel Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4edb6b4a87c44..ad808e92066e1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1616,7 +1616,6 @@ config CMDLINE_EXTEND config CMDLINE_FORCE bool "Always use the default kernel command string" - depends on !ARCH_MULTIPLATFORM help Always use the default kernel command string, even if the boot loader passes other arguments to the kernel.