From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 03 Jul 2023 08:07:39 +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 1qGCiq-00D9eS-JN for lore@lore.pengutronix.de; Mon, 03 Jul 2023 08:07:39 +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 1qGCio-0005iw-4O; Mon, 03 Jul 2023 08:07:38 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qGCif-0005ia-6l; Mon, 03 Jul 2023 08:07:29 +0200 Date: Mon, 3 Jul 2023 08:07:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=default; t=1688364447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MUj/m8LvZoJRyFr5AZZXdqna6tUehY5Siq1uq9Bhv/0=; b=uHr+NI2PhSp3CmvCpb1NUQ7Z5gdanXqfk+pY3pZTmxiUODOk+Y+fYj3DxdXfhBFCtNaepE qpZUJfN7lpip7WSoMLkoLHbYK1yoo3K9PyytBqEgyceteKqxENdx3/xiMfCAnBjpEUsP/Y CVjCyhGGrOwEe8zWePMwXwalX1xtr6dKe7WI1pyqm3+giaALevRBYrdO1h/ccvC3VKAauO suq2tK2xFXsfRLehA7KD9klLmZdYIu8Eq29q1DK6VWXAYgRDWL1H38I0a5hQosmsELQRqr G8QaVTpzPMEd9i+4/avfXO7Xf/WRBUH/3iIbsZteq8W/7J63SYrtREDzgROqww== From: Alexander Dahl To: Michael Olbrich Message-ID: <20230703-triceps-cloud-e9dfa6166be3@ifak-system.com> Mail-Followup-To: Michael Olbrich , distrokit@pengutronix.de, Ahmad Fatoum References: <20230630120847.3271567-1-ada@thorsis.com> Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 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: Alexander Dahl , distrokit@pengutronix.de, Ahmad Fatoum 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 Hello Michael, Am Fri, Jun 30, 2023 at 07:11:33PM +0200 schrieb Michael Olbrich: > 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 > > Reviewed-by: Michael Olbrich > > It would make sense to move this stuff into the platform since it's only > used there, but that's unrelated to this patch. The commit message of 4dbcbb498769 ("v7a: rpi2: move rpi-firmware directory to top-level workspace") implies that someone wanted to add rpi3 and rpi4 support to v8a, and avoid duplicating those firmware files in multiple platforms. That v8a rpi support just did not happen. Yet? ;-) Greets Alex > > Michael > > > --- > > 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. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |