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-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] Add capability to prepend the command line
Date: Tue, 2 Apr 2019 09:08:40 +0000 (UTC) [thread overview]
Message-ID: <cbd5b58e286d891cded00eb46f279d0e9d86f819.1554195798.git.christophe.leroy@c-s.fr> (raw)
In-Reply-To: <cover.1554195798.git.christophe.leroy@c-s.fr>
This patchs adds an option of prepend a text to the command
line instead of appending it.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
include/linux/cmdline.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/cmdline.h b/include/linux/cmdline.h
index afcc00d7628d..5caf3724c1ab 100644
--- a/include/linux/cmdline.h
+++ b/include/linux/cmdline.h
@@ -3,7 +3,7 @@
#define _LINUX_CMDLINE_H
/*
- * This function will append a builtin command line to the command
+ * This function will append or prepend a builtin command line to the command
* line provided by the bootloader. Kconfig options can be used to alter
* the behavior of this builtin command line.
* @dest: The destination of the final appended/prepended string.
@@ -22,6 +22,9 @@ static __always_inline void cmdline_build(char *dest, const char *src, size_t le
strlcat(dest, CONFIG_CMDLINE, length);
return;
}
+
+ if (IS_ENABLED(CONFIG_CMDLINE_PREPEND) && sizeof(CONFIG_CMDLINE) > 1)
+ strlcat(dest, CONFIG_CMDLINE " ", length);
#endif
if (dest != src)
strlcat(dest, src, length);
--
2.13.3
next prev parent reply other threads:[~2019-04-02 9:18 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 ` Christophe Leroy [this message]
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 ` [PATCH 9/9] powerpc: use generic CMDLINE manipulations Christophe Leroy
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=cbd5b58e286d891cded00eb46f279d0e9d86f819.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).