arm64: Kconfig: make CMDLINE_FORCE depend on CMDLINE

Message ID 20191111085956.6158-1-anders.roxell@linaro.org
State Accepted
Commit f70c08e46d55126efa6d23e149f8472c178686f2
Headers show
Series
  • arm64: Kconfig: make CMDLINE_FORCE depend on CMDLINE
Related show

Commit Message

Anders Roxell Nov. 11, 2019, 8:59 a.m.
When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig
CONFIG_CMDLINE_FORCE gets enabled. Which forces the user to pass the
full cmdline to CONFIG_CMDLINE="...".

Rework so that CONFIG_CMDLINE_FORCE gets set only if CONFIG_CMDLINE is
set to something except an empty string.

Suggested-by: John Garry <john.garry@huawei.com>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 arch/arm64/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.20.1

Comments

Will Deacon Nov. 11, 2019, 10:26 a.m. | #1
On Mon, Nov 11, 2019 at 09:59:56AM +0100, Anders Roxell wrote:
> When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig

> CONFIG_CMDLINE_FORCE gets enabled. Which forces the user to pass the

> full cmdline to CONFIG_CMDLINE="...".

> 

> Rework so that CONFIG_CMDLINE_FORCE gets set only if CONFIG_CMDLINE is

> set to something except an empty string.

> 

> Suggested-by: John Garry <john.garry@huawei.com>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

>  arch/arm64/Kconfig | 1 +

>  1 file changed, 1 insertion(+)

> 

> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig

> index 50df79d4aa3b..64764ca92fca 100644

> --- a/arch/arm64/Kconfig

> +++ b/arch/arm64/Kconfig

> @@ -1629,6 +1629,7 @@ config CMDLINE

>  

>  config CMDLINE_FORCE

>  	bool "Always use the default kernel command string"

> +	depends on CMDLINE != ""

>  	help

>  	  Always use the default kernel command string, even if the boot

>  	  loader passes other arguments to the kernel.


Acked-by: Will Deacon <will@kernel.org>


Will
John Garry Nov. 11, 2019, 2:14 p.m. | #2
On 11/11/2019 08:59, Anders Roxell wrote:
> When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig

> CONFIG_CMDLINE_FORCE gets enabled. Which forces the user to pass the

> full cmdline to CONFIG_CMDLINE="...".

> 

> Rework so that CONFIG_CMDLINE_FORCE gets set only if CONFIG_CMDLINE is

> set to something except an empty string.

> 

> Suggested-by: John Garry <john.garry@huawei.com>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---


This looks ok.

Were you also going to propose a patch to introduce a LITTLE ENDIAN 
config option?

For me, this would mean that ACPI module is built for allmodconfig, 
which is a good thing.

Thanks,
john


>   arch/arm64/Kconfig | 1 +

>   1 file changed, 1 insertion(+)

> 

> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig

> index 50df79d4aa3b..64764ca92fca 100644

> --- a/arch/arm64/Kconfig

> +++ b/arch/arm64/Kconfig

> @@ -1629,6 +1629,7 @@ config CMDLINE

>   

>   config CMDLINE_FORCE

>   	bool "Always use the default kernel command string"

> +	depends on CMDLINE != ""

>   	help

>   	  Always use the default kernel command string, even if the boot

>   	  loader passes other arguments to the kernel.

>
Catalin Marinas Nov. 11, 2019, 6:23 p.m. | #3
On Mon, Nov 11, 2019 at 09:59:56AM +0100, Anders Roxell wrote:
> When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig

> CONFIG_CMDLINE_FORCE gets enabled. Which forces the user to pass the

> full cmdline to CONFIG_CMDLINE="...".

> 

> Rework so that CONFIG_CMDLINE_FORCE gets set only if CONFIG_CMDLINE is

> set to something except an empty string.

> 

> Suggested-by: John Garry <john.garry@huawei.com>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>


Queued for 5.5.

-- 
Catalin

Patch

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 50df79d4aa3b..64764ca92fca 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1629,6 +1629,7 @@  config CMDLINE
 
 config CMDLINE_FORCE
 	bool "Always use the default kernel command string"
+	depends on CMDLINE != ""
 	help
 	  Always use the default kernel command string, even if the boot
 	  loader passes other arguments to the kernel.