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@xxxxxxxxxxxxxx> > >> > >> 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@xxxxxxxxxxxxxx> > >> [bst: dropped a new line removal, extend commit message] > >> Signed-off-by: Bastian Krause <bst@xxxxxxxxxxxxxx> > >> --- > >> 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
