RISC-V: Rename CONFIG_CMDLINE_OVERRIDE to CONFIG_CMDLINE_FORCE

The device tree code looks for CONFIG_CMDLINE_FORCE, but we were using
CONFIG_CMDLINE_OVERRIDE.  It looks like this was just a hold over from
before our device tree conversion -- in fact, we'd already removed the
support for CONFIG_CMDLINE_OVERRIDE from our arch-specific code so it
didn't even work any more.

Thanks to Mortiz and Trung for finding the original bug, and for Michael
for suggeting a better fix.

CC: Trung Tran <[email protected]>
CC: Michael J Clark <[email protected]>
Reviewed-by: Moritz Fischer <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 1df6e264edd3df9bdb1ccaa22f2f5458ba0660a5..e8379daf9334f3809505f80df9e134d3a95dab2d 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -289,7 +289,7 @@ config CMDLINE_BOOL
          in CONFIG_CMDLINE.
 
          The built-in options will be concatenated to the default command
-         line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default
+         line if CMDLINE_FORCE is set to 'N'. Otherwise, the default
          command line will be ignored and replaced by the built-in string.
 
 config CMDLINE
@@ -299,7 +299,7 @@ config CMDLINE
        help
          Supply command-line options at build time by entering them here.
 
-config CMDLINE_OVERRIDE
+config CMDLINE_FORCE
        bool "Built-in command line overrides bootloader arguments"
        depends on CMDLINE_BOOL
        help