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: Moritz Fischer <[email protected]>
CC: Michael J Clark <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
---
arch/riscv/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 04807c7f64cc..992412dda60c 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -281,7 +281,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
@@ -291,7 +291,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
--
2.16.1
Hi Palmer,
On Wed, Mar 14, 2018 at 09:41:43AM -0700, Palmer Dabbelt wrote:
> 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
Nit: s/Mortiz/Moritz/g ;-)
> for suggeting a better fix.
>
> CC: Trung Tran <[email protected]>
> CC: Moritz Fischer <[email protected]>
> CC: Michael J Clark <[email protected]>
> Signed-off-by: Palmer Dabbelt <[email protected]>
Reviewed-by: Moritz Fischer <[email protected]>
> ---
> arch/riscv/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 04807c7f64cc..992412dda60c 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -281,7 +281,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
> @@ -291,7 +291,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
> --
> 2.16.1
>
Cheers,
Moritz