From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Feb 2023 20:36:26 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pQZC8-003QMU-11 for lore@lore.pengutronix.de; Fri, 10 Feb 2023 20:36:26 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pQZC2-0006Gz-HE; Fri, 10 Feb 2023 20:36:22 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pQZBx-00063N-9q for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:17 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pQZBv-0043f7-EH for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:16 +0100 Received: from mfe by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pQZBu-008zkq-JB for distrokit@pengutronix.de; Fri, 10 Feb 2023 20:36:14 +0100 From: Marco Felsch To: distrokit@pengutronix.de Date: Fri, 10 Feb 2023 20:36:08 +0100 Message-Id: <20230210193612.2143905-11-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230210193612.2143905-1-m.felsch@pengutronix.de> References: <20230210193612.2143905-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- platforms/blspec-entry.in | 8 ++++++++ projectroot/loader/entries/default.conf | 1 + rules/blspec-entry.make | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in index aed65d4..c2aea36 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 5650907..d281569 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 f393b1b..7523009 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) -- 2.30.2