From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 24 Mar 2023 10:04:11 +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 1pfdLG-00D3l0-Rz for lore@lore.pengutronix.de; Fri, 24 Mar 2023 10:04:11 +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 1pfdLG-0000II-Qv; Fri, 24 Mar 2023 10:04:10 +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 1pfdKj-0008BE-LE; Fri, 24 Mar 2023 10:03:37 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pfdKj-006LCK-0c; Fri, 24 Mar 2023 10:03:37 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfdKi-001Fyh-8j; Fri, 24 Mar 2023 10:03:36 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 24 Mar 2023 10:03:36 +0100 Message-Id: <20230324090336.299525-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230317105503.1278217-1-rhi@pengutronix.de> References: <20230317105503.1278217-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] image-hdimage: make barebox image configurable X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 5c36e112956b54b47c85bedd0429d4cf3ceac6ef. Michael [sent from post-receive hook] On Fri, 24 Mar 2023 10:03:36 +0100, Roland Hieber wrote: > The default name, 'barebox-image', is a symlink to the last installed > file by the barebox recipe, which is not always the barebox that we want > when multi-image support is enabled in the barebox config. > > Signed-off-by: Roland Hieber > Message-Id: <20230317105503.1278217-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/config/images/barebox_partitions.config b/config/images/barebox_partitions.config > index 114b461d9099..450e055f213a 100644 > --- a/config/images/barebox_partitions.config > +++ b/config/images/barebox_partitions.config > @@ -1,6 +1,6 @@ > partition barebox { > in-partition-table = false > - image = "barebox-image" > + image = "@BAREBOX_IMAGE@" > holes = {"(440; 1024)"} > size = 2M > } > diff --git a/platforms/image-hdimg.in b/platforms/image-hdimg.in > index be37ba60feb2..b0b164230f60 100644 > --- a/platforms/image-hdimg.in > +++ b/platforms/image-hdimg.in > @@ -46,4 +46,18 @@ config IMAGE_HDIMG_VFAT > > endchoice > > +if IMAGE_HDIMG_BAREBOX > + > +config IMAGE_HDIMG_BAREBOX_IMAGE > + string > + prompt "barebox image name" > + default "barebox-image" > + help > + If barebox creates multiple images, configure the file name of the > + image (relative to $IMAGEDIR) which should be written into hd.img. > + > + The default is 'barebox-image', which is a symlink to the last image > + installed by the barebox recipe. > +endif > + > endif > diff --git a/rules/image-hdimg.make b/rules/image-hdimg.make > index 02f7f84bfcad..2aa8aeddaf78 100644 > --- a/rules/image-hdimg.make > +++ b/rules/image-hdimg.make > @@ -38,6 +38,7 @@ endif > ifdef PTXCONF_IMAGE_HDIMG_BAREBOX > IMAGE_HDIMG_BOOTLOADER_ENV := \ > GPT_LOCATION='2M' \ > + BAREBOX_IMAGE=$(PTXCONF_IMAGE_HDIMG_BAREBOX_IMAGE) \ > BOOTLOADER_IMAGES='' \ > BOOTLOADER_PARTITIONS='include("barebox_partitions.config")' > endif