This patch moves powerpc to the centraly defined CMDLINE options.

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/Kconfig | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 0ab406f14513..0e1736a2a621 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -195,6 +195,7 @@ config PPC
        select HAVE_CBPF_JIT                    if !PPC64
        select HAVE_STACKPROTECTOR              if PPC64 && 
$(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
        select HAVE_STACKPROTECTOR              if PPC32 && 
$(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
+       select HAVE_CMDLINE
        select HAVE_CONTEXT_TRACKING            if PPC64
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DEBUG_STACKOVERFLOW
@@ -886,47 +887,9 @@ config PPC_DENORMALISATION
          Add support for handling denormalisation of single precision
          values.  Useful for bare metal only.  If unsure say Y here.
 
-config CMDLINE
-       string "Initial kernel command string"
+config DEFAULT_CMDLINE
+       string
        default ""
-       help
-         On some platforms, there is currently no way for the boot loader to
-         pass arguments to the kernel. For these platforms, you can supply
-         some command-line options at build time by entering them here.  In
-         most cases you will need to specify the root device here.
-
-choice
-       prompt "Kernel command line type" if CMDLINE != ""
-       default CMDLINE_FROM_BOOTLOADER
-
-config CMDLINE_FROM_BOOTLOADER
-       bool "Use bootloader kernel arguments if available"
-       help
-         Uses the command-line options passed by the boot loader. If
-         the boot loader doesn't provide any, the default kernel command
-         string provided in CMDLINE will be used.
-
-config CMDLINE_EXTEND
-       bool "Extend bootloader kernel arguments"
-       help
-         The command-line arguments provided by the boot loader will be
-         appended to the default kernel command string.
-
-config CMDLINE_PREPEND
-       bool "Prepend bootloader kernel arguments"
-       help
-         The default kernel command string will be prepend to the
-         command-line arguments provided during boot.
-
-config CMDLINE_FORCE
-       bool "Always use the default kernel command string"
-       help
-         Always use the default kernel command string, even if the boot
-         loader passes other arguments to the kernel.
-         This is useful if you cannot or don't want to change the
-         command-line options your boot loader passes to the kernel.
-
-endchoice
 
 config EXTRA_TARGETS
        string "Additional default image types"
-- 
2.25.0

Reply via email to