Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support

[Marco Felsch <m.felsch@pengutronix.de>]

On 22-09-02, Michael Olbrich wrote:
> On Fri, Sep 02, 2022 at 10:03:42AM +0200, Marco Felsch wrote:
> > On 22-09-02, Michael Olbrich wrote:
> > > On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote:
> > > > Add a Kconfig switch to set the linxu-appendroot option to true. This
> > > > can be very useful for the Barebox bootloader.
> > > > 
> > > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > > > ---
> > > >  platforms/blspec-entry.in               | 10 ++++++++++
> > > >  projectroot/loader/entries/default.conf |  1 +
> > > >  rules/blspec-entry.make                 | 10 +++++++++-
> > > >  3 files changed, 20 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> > > > index aed65d40a..1a4ecb26c 100644
> > > > --- a/platforms/blspec-entry.in
> > > > +++ b/platforms/blspec-entry.in
> > > > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
> > > >  	string
> > > >  	prompt "kernel command-line"
> > > >  
> > > > +config BLSPEC_ENTRY_APPENDROOT
> > > > +	bool
> > > > +	prompt "Set linux-appendroot to true"
> > > > +	help
> > > > +	  If enabled this options adds 'linux-appendroot true' to the blspec
> > > > +	  entry else 'linux-appendroot false' is added. This is a useful
> > > > +	  Barebox specific option. Barebox will set the the 'root=' kernel
> > > > +	  command line parameter to the source from which Barebox loaded the
> > > > +	  kernel image if specified.
> > > > +
> > > >  endif
> > > > diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> > > > index 5650907ab..d28156975 100644
> > > > --- a/projectroot/loader/entries/default.conf
> > > > +++ b/projectroot/loader/entries/default.conf
> > > > @@ -3,3 +3,4 @@ version		@VERSION@
> > > >  options		@CMDLINE@
> > > >  linux		@KERNEL@
> > > >  @DEVICETREE@
> > > > +@LINUXAPPENDROOT@
> > > > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> > > > index f393b1bda..c0d2416cf 100644
> > > > --- a/rules/blspec-entry.make
> > > > +++ b/rules/blspec-entry.make
> > > > @@ -35,6 +35,12 @@ else
> > > >  BLSPEC_KERNEL_IMAGE	= $(KERNEL_IMAGE)
> > > >  endif
> > > >  
> > > > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> > > > +BLSPEC_APPENDROOT	= linux-appendroot\ttrue
> > > > +else
> > > > +BLSPEC_APPENDROOT	= linux-appendroot\tfalse
> > > 
> > > Hmm, that's the default, right? So use an empty string here. It keeps the
> > > file shorter and (mostly) unchanged for those that keep the option
> > > disabled. It's a non-standard option so I'd prefer to not have it here
> > > unless it is explicitly enabled.
> > 
> > Okay, I will do that. Just one question will it add a blank line instead
> > or is the line taken by @LINUXAPPENDROOT@ completely gone?
> 
> It will be a blank line, but I think that's ok.

Okay, so blank line it is :) I will send a v2.

Regards,
  Marco

> You could merge it with the @DEVICETREE@ line and add a '\n' at the
> beginning of the substitution.  But I'm not sure if it's worth it.
> 
> Michael
> 
> -- 
> 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 |
>