From: Sascha Hauer <sha@pengutronix.de>
To: Bastian Krause <bst@pengutronix.de>
Cc: barebox@lists.infradead.org, a.fatoum@pengutronix.de
Subject: Re: [PATCH 2/2] of: introduce global.linux.bootargs_overwrite
Date: Tue, 13 Apr 2021 11:05:31 +0200 [thread overview]
Message-ID: <20210413090531.GM19819@pengutronix.de> (raw)
In-Reply-To: <5039de85-c337-6781-eef3-0e8e4ca17fff@pengutronix.de>
On Tue, Apr 13, 2021 at 10:22:07AM +0200, Bastian Krause wrote:
> On 4/13/21 7:16 AM, Sascha Hauer wrote:
> > On Fri, Apr 09, 2021 at 10:15:03AM +0200, 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. It allows either overwriting the oftree bootargs
> >> (global.linux.bootargs_overwrite=1) or appending barebox' bootargs to
> >> the oftree bootargs (global.linux.bootargs_overwrite=0).
> >>
> >> 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>
> >> ---
> >> common/oftree.c | 22 +++++++++++++++++++++-
> >> 1 file changed, 21 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/common/oftree.c b/common/oftree.c
> >> index aaeb199a9e..f3a5d9c5d1 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_overwrite = 1;
> >> +BAREBOX_MAGICVAR(global.linux.bootargs_overwrite, "overwrite original oftree bootargs");
> >
> > How about naming it global.linux.bootargs_append instead? It would make
> > it more clear that we are deviating from the default by setting the
> > variable to true.
> >
>
> That's fine with me.
>
> Can you change that or should I send a v2?
Please send a v2
Thanks
Sascha
--
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
prev parent reply other threads:[~2021-04-13 9:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 8:15 [PATCH 1/2] of: fix up /chosen node even when there are no bootargs Bastian Krause
2021-04-09 8:15 ` [PATCH 2/2] of: introduce global.linux.bootargs_overwrite Bastian Krause
2021-04-13 5:16 ` Sascha Hauer
2021-04-13 8:22 ` Bastian Krause
2021-04-13 9:05 ` Sascha Hauer [this message]
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=20210413090531.GM19819@pengutronix.de \
--to=sha@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=bst@pengutronix.de \
/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