From 2966ebc507e234b6a2dac815a0aee86313823ee8 Mon Sep 17 00:00:00 2001 From: Joakim Bech Date: Mon, 27 Nov 2023 12:52:05 +0100 Subject: [PATCH] rpi3: fix dependency issue when building The Raspberry Pi 3 build appears to complete with no errors from time to time, but it is still an incomplete build because the image for the SD card for example has not been built. This is most likely due to a dependency error in the Makefile. After reviewing the dependencies, it appears that at least two of them were incorrect or absent. - Add 'u-boot' instead of 'u-boot-env' as a dependency to TF-A. - Add 'linux' and 'u-boot-env' as a dependency to the boot filesystem. Fixes: https://github.com/OP-TEE/optee_os/issues/6442 Signed-off-by: Joakim Bech Reviewed-by: Jerome Forissier --- rpi3.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpi3.mk b/rpi3.mk index 3996a2bd..f2e45b90 100644 --- a/rpi3.mk +++ b/rpi3.mk @@ -93,7 +93,7 @@ TF_A_FLAGS ?= \ RPI3_PRELOADED_DTB_BASE=0x00010000 \ SPD=opteed -tf-a: optee-os u-boot-env +tf-a: optee-os u-boot $(TF_A_EXPORTS) $(MAKE) -C $(TF_A_PATH) $(TF_A_FLAGS) all fip tf-a-clean: @@ -179,7 +179,7 @@ update_rootfs: linux @mkdir -p --mode=755 $(BUILDROOT_TARGET_ROOT)/usr/bin @cd $(MODULE_OUTPUT) && find . | cpio -pudm $(BUILDROOT_TARGET_ROOT) -update_bootfs: tf-a u-boot +update_bootfs: tf-a linux u-boot-env @mkdir -p --mode=755 $(BOOT_PARTITION_FILES) @install -v -p --mode=755 $(LINUX_DTB_RPI3_B) $(BOOT_PARTITION_FILES)/bcm2710-rpi-3-b.dtb @install -v -p --mode=755 $(LINUX_DTB_RPI3_BPLUS) $(BOOT_PARTITION_FILES)/bcm2710-rpi-3-b-plus.dtb