From: Bastian Krause <bst@pengutronix.de>
To: barebox@lists.infradead.org
Cc: a.fatoum@pengutronix.de
Subject: Re: [PATCH v2 2/2] of: introduce global.linux.bootargs_append
Date: Tue, 25 May 2021 10:53:48 +0200 [thread overview]
Message-ID: <0f5aa510-5e65-0897-a212-e08305b8eb1c@pengutronix.de> (raw)
In-Reply-To: <20210414130044.6910-2-bst@pengutronix.de>
On 4/14/21 3:00 PM, Bastian Krause wrote:
> From: Ahmad Fatoum <a.fatoum@pengutronix.de>
>
> By default, barebox overwrites the bootargs in the oftree if it itself
> has any. Make this behavior configurable by adding a new global
> variable.
>
> The new global variable allows either appending barebox' bootargs to the
> original oftree bootargs (global.linux.bootargs_append=1) or overwriting
> the original oftree bootargs (global.linux.bootargs_append=0) as before.
> The default is to overwrite the original bootargs.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> [bst: dropped a new line removal, extend commit message]
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
> Changes since (implicit) v1:
> - use global.linux.bootargs_append instead of
> global.linux.bootargs_overwrite
> - since the meaning is the other way around now, change the default and
> the check in of_write_bootargs()
> ---
> common/oftree.c | 22 +++++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
Gentle ping.
>
> diff --git a/common/oftree.c b/common/oftree.c
> index a8e6587a61..ad2eff362d 100644
> --- a/common/oftree.c
> +++ b/common/oftree.c
> @@ -16,6 +16,7 @@
> #include <reset_source.h>
> #include <watchdog.h>
> #include <globalvar.h>
> +#include <magicvar.h>
>
> #define MAX_LEVEL 32 /* how deeply nested we will go */
>
> @@ -161,9 +162,14 @@ static void watchdog_build_bootargs(struct watchdog *watchdog, struct device_nod
> free(buf);
> }
>
> +static int bootargs_append = 0;
> +BAREBOX_MAGICVAR(global.linux.bootargs_append, "append to original oftree bootargs");
> +
> static int of_write_bootargs(struct device_node *node)
> {
> const char *str;
> + char *buf = NULL;
> + int ret;
>
> if (IS_ENABLED(CONFIG_SYSTEMD_OF_WATCHDOG))
> watchdog_build_bootargs(boot_get_enabled_watchdog(), of_get_parent(node));
> @@ -176,7 +182,20 @@ static int of_write_bootargs(struct device_node *node)
> if (strlen(str) == 0)
> return 0;
>
> - return of_property_write_string(node, "bootargs", str);
> + if (bootargs_append) {
> + const char *oldstr;
> +
> + ret = of_property_read_string(node, "bootargs", &oldstr);
> + if (!ret) {
> + str = buf = basprintf("%s %s", oldstr, str);
> + if (!buf)
> + return -ENOMEM;
> + }
> + }
> +
> + ret = of_property_write_string(node, "bootargs", str);
> + free(buf);
> + return ret;
> }
>
> static int of_fixup_bootargs(struct device_node *root, void *unused)
> @@ -218,6 +237,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
>
> static int of_register_bootargs_fixup(void)
> {
> + globalvar_add_simple_bool("linux.bootargs_append", &bootargs_append);
> return of_register_fixup(of_fixup_bootargs, NULL);
> }
> late_initcall(of_register_bootargs_fixup);
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-05-25 8:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 13:00 [PATCH v2 1/2] of: fix up /chosen node even when there are no bootargs Bastian Krause
2021-04-14 13:00 ` [PATCH v2 2/2] of: introduce global.linux.bootargs_append Bastian Krause
2021-05-25 8:53 ` Bastian Krause [this message]
2021-05-25 8:53 ` [PATCH v2 1/2] of: fix up /chosen node even when there are no bootargs Bastian Krause
2021-05-26 5:53 ` Sascha Hauer
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=0f5aa510-5e65-0897-a212-e08305b8eb1c@pengutronix.de \
--to=bst@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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