diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch b/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch index 7c4fb2c82..39fefa350 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch @@ -15,28 +15,29 @@ file pointed at by the dtbs variable does no longer exist. Remove the file removal to avoid this. Signed-off-by: Gonzalo Ruiz +Signed-off-by: Gabriel Valcazar --- iMX8M/soc.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index b7b3986..fa84c6a 100644 +index 4bfdc37..b6595bc 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak -@@ -143,7 +143,7 @@ u-boot.itb: $(dtbs) - ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) - DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs) > u-boot.its +@@ -149,7 +149,7 @@ u-boot.itb: $(dtb) + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb) > u-boot.its ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb -- @rm -f u-boot.its $(dtbs) +- @rm -f u-boot.its $(dtb) + @rm -f u-boot.its - dtbs_ddr3l = valddr3l.dtb - $(dtbs_ddr3l): -@@ -256,7 +256,6 @@ print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtbs) + dtb_ddr3l = valddr3l.dtb + $(dtb_ddr3l): +@@ -283,7 +283,6 @@ print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtb) ./$(PAD_IMAGE) bl31.bin - ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) - TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs) -- @rm -f $(dtbs) + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) + TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb) +- @rm -f $(dtb) - print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtbs_ddr4_evk) + print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtb_ddr4_evk) ./$(PAD_IMAGE) tee.bin