From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 11 Jul 2023 07:36:18 +0200 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 1qJ62u-006jnJ-0w for lore@lore.pengutronix.de; Tue, 11 Jul 2023 07:36:18 +0200 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 1qJ62r-0006Hj-E5; Tue, 11 Jul 2023 07:36:17 +0200 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qJ62l-0006Ha-7u; Tue, 11 Jul 2023 07:36:11 +0200 Received: from rsc by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qJ62k-003KyO-Pd; Tue, 11 Jul 2023 07:36:10 +0200 Date: Tue, 11 Jul 2023 07:36:10 +0200 From: Robert Schwebel To: Alexander Dahl Message-ID: References: <20230630120847.3271567-1-ada@thorsis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230630120847.3271567-1-ada@thorsis.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer 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: , Cc: distrokit@pengutronix.de 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 applied to next On Fri, Jun 30, 2023 at 02:08:47PM +0200, Alexander Dahl wrote: > When DistroKit was used as a base layer, the firmware was not in > '$(PTXDIST_WORKSPACE)/rpi-firmware' but in > '$(PTXDIST_WORKSPACE)/base/rpi-firmware' or > '$(PTXDIST_WORKSPACE)/base/base/rpi-firmware' … so we just need to look > for it in all layers. Otherwise no firmware is put to the FAT partition > of the SD card image and the device does not boot at all. > > Fixes: 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace") > Signed-off-by: Alexander Dahl > --- > configs/platform-v7a/rules/image-rpi2.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make > index e74edd1..22f1158 100644 > --- a/configs/platform-v7a/rules/image-rpi2.make > +++ b/configs/platform-v7a/rules/image-rpi2.make > @@ -19,7 +19,7 @@ IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2) > IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg > IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz > IMAGE_RPI2_CONFIG := rpi2.config > -IMAGE_RPI2_DATA_DIR := $(PTXDIST_WORKSPACE)/rpi-firmware > +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware) > IMAGE_RPI2_DATA := \ > $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \ > $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \ > > base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644 > -- > 2.30.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |