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 <[email protected]>
Acked-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4edb6b4a87c449d4f5743eea92ad64a52814e11a..ad808e92066e1f8d361736c2b2123b03520e52fc 100644 (file)
--- 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.