From a96a739eee17f6994c38f3621cc25980e229e507 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Fri, 30 Jun 2023 14:08:47 +0200 Subject: v7a: rpi2: Restore finding rpi-firmware when used as base layer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Link: https://lore.barebox.org/20230630120847.3271567-1-ada@thorsis.com Signed-off-by: Robert Schwebel --- configs/platform-v7a/rules/image-rpi2.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/platform-v7a') 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) \ -- cgit v1.2.3