DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: distrokit@pengutronix.de
Subject: [DistroKit] [PATCH] v7a: rpi2: Restore finding rpi-firmware when used as base layer
Date: Fri, 30 Jun 2023 14:08:47 +0200	[thread overview]
Message-ID: <20230630120847.3271567-1-ada@thorsis.com> (raw)

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 <ada@thorsis.com>
 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_CONFIG	:= rpi2.config
+IMAGE_RPI2_DATA_DIR	:= $(call ptx/in-path, PTXDIST_PATH, rpi-firmware)
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \

base-commit: 79db26e54a2974dbcdcf2752ea5af15e95c5b644

             reply	other threads:[~2023-06-30 12:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-30 12:08 Alexander Dahl [this message]
2023-06-30 17:11 ` Michael Olbrich
2023-07-03  6:07   ` Alexander Dahl
2023-07-11  5:36 ` Robert Schwebel

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230630120847.3271567-1-ada@thorsis.com \
    --to=ada@thorsis.com \
    --cc=distrokit@pengutronix.de \


* 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