From: Gonzalo Ruiz Date: Wed, 23 Sep 2020 10:15:08 +0200 Subject: [PATCH] imx8m: soc.mak: preserve dtbs after build On commit ab433440269bbd5383b47ee60957e9906cda0b3b a dtb preprocess was introduced to have compatibility with old U-Boots. As part of those changes, the content of variable $(dtbs) was deleted at the end of the build. Since we added the dtbs variable as an argument, building is causing the original dtb file to be removed, and a second build is failing since the file pointed at by the dtbs variable does no longer exist. Remove the file removal to avoid this. Upstream-Status: Inappropriate [digi specific] Signed-off-by: Gonzalo Ruiz Signed-off-by: Gabriel Valcazar Signed-off-by: Javier Viguera --- iMX8M/soc.mak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak index 6751759..5a96614 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak @@ -161,7 +161,7 @@ u-boot.itb: $(dtb) $(supp_dtbs) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs) BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb) $(supp_dtbs) > u-boot.its mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot.its u-boot.itb - @rm -f u-boot.its $(dtb) + @rm -f u-boot.its dtb_ddr3l = valddr3l.dtb $(dtb_ddr3l): @@ -329,7 +329,8 @@ print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtb) $(supp_dtbs) ./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs) FIT_DATA_POS=$(FIT_EXTERNAL_POSITION) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ../$(SOC_DIR)/print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb) $(supp_dtbs) - @rm -f $(dtb) + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) + TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ../$(SOC_DIR)/print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb) print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtb_ddr4_evk) $(supp_dtbs) ./$(PAD_IMAGE) $(TEE)