From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] blspec-entry: add linux-appendroot support
Date: Fri, 17 Feb 2023 16:35:34 +0100 [thread overview]
Message-ID: <20230217153534.1232560-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230210192144.2133757-1-m.felsch@pengutronix.de>
Thanks, applied as 09f00b06b28298cbf135bee30b2d5d04874ab410.
Michael
[sent from post-receive hook]
On Fri, 17 Feb 2023 16:35:34 +0100, Marco Felsch <m.felsch@pengutronix.de> wrote:
> Add the option to add the 'linux-appendroot true' to blspec config file
> which is very useful in case of using barebox as bootlaoder.
>
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Message-Id: <20230210192144.2133757-1-m.felsch@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> index aed65d40a329..c2aea36dc8cc 100644
> --- a/platforms/blspec-entry.in
> +++ b/platforms/blspec-entry.in
> @@ -16,4 +16,12 @@ config BLSPEC_ENTRY_CMDLINE
> string
> prompt "kernel command-line"
>
> +config BLSPEC_ENTRY_APPENDROOT
> + bool
> + prompt "Add 'linux-appendroot true'"
> + help
> + If enabled this options adds 'linux-appendroot true' to the blspec
> + entry. This is a barebox specific blspec option which tells barebox
> + to add the 'root=' kernel command line automatically if set.
> +
> endif
> diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> index 5650907ab11b..d2815697511e 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 f393b1bda162..7523009f6197 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 =
> +endif
> +
> $(STATEDIR)/blspec-entry.targetinstall:
> @$(call targetinfo)
>
> @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall:
> $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
> $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
> + @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \
> + $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> + @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl))
>
> @$(call install_finish,blspec-entry)
>
prev parent reply other threads:[~2023-02-17 15:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 19:21 [ptxdist] [PATCH v2] " Marco Felsch
2023-02-17 15:35 ` Michael Olbrich [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=20230217153534.1232560-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.felsch@pengutronix.de \
--cc=ptxdist@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