diff options
author | Alexander Dahl <ada@thorsis.com> | 2023-06-30 14:08:47 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2023-08-15 09:58:58 +0200 |
commit | a96a739eee17f6994c38f3621cc25980e229e507 (patch) | |
tree | 5e55433b5d3843c96ed05e7680d8aeed7b7866cb /configs/platform-v7a | |
parent | 5a16f659bb538919660f6fef72bc4048deb68609 (diff) | |
download | DistroKit-a96a739eee17f6994c38f3621cc25980e229e507.tar.gz DistroKit-a96a739eee17f6994c38f3621cc25980e229e507.tar.xz |
v7a: rpi2: Restore finding rpi-firmware when used as base layer
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>
Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
Link: https://lore.barebox.org/20230630120847.3271567-1-ada@thorsis.com
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'configs/platform-v7a')
-rw-r--r-- | configs/platform-v7a/rules/image-rpi2.make | 2 |
1 files changed, 1 insertions, 1 deletions
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) \ |