From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
danielwa@cisco.com
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-arch@vger.kernel.org
Subject: [PATCH 9/9] powerpc: use generic CMDLINE manipulations
Date: Tue, 2 Apr 2019 09:08:44 +0000 (UTC) [thread overview]
Message-ID: <61573f2503d4018b763102d719e3d27794bccfb9.1554195798.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1554195798.git.christophe.leroy@c-s.fr>
This patch moves powerpc to the centraly defined CMDLINE options.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/Kconfig | 48 +++---------------------------------------------
1 file changed, 3 insertions(+), 45 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 22d6a48bd2ca..6a71d7c514cc 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -182,6 +182,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
@@ -828,52 +829,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_BOOL
- bool "Default bootloader kernel arguments"
-
-config CMDLINE
- string "Initial kernel command string"
- depends on CMDLINE_BOOL
+config DEFAULT_CMDLINE
+ string
default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
- 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
- help
- Selects the way you want to use the default kernel arguments.
-
-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 default kernel command string will be appended to the
- command-line arguments provided during boot.
-
-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.13.3
next prev parent reply other threads:[~2019-04-02 9:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-02 9:08 [PATCH 0/9] Improve boot command line handling Christophe Leroy
2019-04-02 9:08 ` [PATCH 1/9] powerpc: enable appending of CONFIG_CMDLINE to bootloader's cmdline Christophe Leroy
2019-04-02 9:08 ` [PATCH 2/9] Add generic function to build command line Christophe Leroy
2019-04-02 9:08 ` [PATCH 3/9] drivers: of: use cmdline building function Christophe Leroy
2019-04-02 9:08 ` [PATCH 4/9] powerpc/prom_init: get rid of PROM_SCRATCH_SIZE Christophe Leroy
2019-05-03 6:59 ` Michael Ellerman
2019-04-02 9:08 ` [PATCH 5/9] powerpc: convert to generic builtin command line Christophe Leroy
2019-04-02 9:08 ` [PATCH 6/9] Add capability to prepend the " Christophe Leroy
2019-04-02 9:08 ` [PATCH 7/9] powerpc: add capability to prepend default " Christophe Leroy
2019-04-02 9:08 ` [PATCH 8/9] Gives arches opportunity to use generically defined boot cmdline manipulation Christophe Leroy
2019-04-02 9:08 ` Christophe Leroy [this message]
2019-12-03 9:12 ` [PATCH 0/9] Improve boot command line handling Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=61573f2503d4018b763102d719e3d27794bccfb9.1554195798.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=danielwa@cisco.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).