80 lines
4.1 KiB
Diff
80 lines
4.1 KiB
Diff
From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
|
Date: Wed, 19 Jul 2023 18:34:32 +0300
|
|
Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot
|
|
|
|
mkimage tool is provided as a part of sysroot from Yocto build. Current
|
|
implementation on the imx-mkimge on the other hand copies it locally in
|
|
order to invoke it from within the build folder.
|
|
|
|
Since recent updates, mkimage requires openssl.so to be installed, which
|
|
when local copy is used causes the tool not to operate and fails the
|
|
build.
|
|
|
|
Use it from the build sysroot, and do not pull the local version of it.
|
|
|
|
Reinjected the original patch from Andrey Zhizhikin <andrey.z@gmail.com>
|
|
|
|
Upstream-Status: Inappropriate [OE-specific]
|
|
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
|
|
---
|
|
iMX8M/soc.mak | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
|
|
index e7c762b748a1..f1b37a4f425a 100644
|
|
--- a/iMX8M/soc.mak
|
|
+++ b/iMX8M/soc.mak
|
|
@@ -160,7 +160,7 @@ u-boot.itb: $(dtb) $(supp_dtbs)
|
|
./$(PAD_IMAGE) bl31.bin
|
|
./$(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_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot.its u-boot.itb
|
|
+ mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot.its u-boot.itb
|
|
@rm -f u-boot.its $(dtb)
|
|
|
|
dtb_ddr3l = valddr3l.dtb
|
|
@@ -172,7 +172,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dtbs)
|
|
./$(PAD_IMAGE) bl31.bin
|
|
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs)
|
|
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_ddr3l) $(supp_dtbs) > u-boot-ddr3l.its
|
|
- ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l.its u-boot-ddr3l.itb
|
|
+ mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l.its u-boot-ddr3l.itb
|
|
@rm -f u-boot.its $(dtb_ddr3l)
|
|
|
|
dtb_ddr3l_evk = evkddr3l.dtb
|
|
@@ -184,7 +184,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $(supp_dtbs)
|
|
./$(PAD_IMAGE) bl31.bin
|
|
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs)
|
|
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_ddr3l_evk) $(supp_dtbs) > u-boot-ddr3l-evk.its
|
|
- ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
|
|
+ mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
|
|
@rm -f u-boot.its $(dtb_ddr3l_evk)
|
|
|
|
dtb_ddr4 = valddr4.dtb
|
|
@@ -196,7 +196,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs)
|
|
./$(PAD_IMAGE) bl31.bin
|
|
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs)
|
|
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_ddr4) $(supp_dtbs) > u-boot-ddr4.its
|
|
- ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4.its u-boot-ddr4.itb
|
|
+ mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4.its u-boot-ddr4.itb
|
|
@rm -f u-boot.its $(dtb_ddr4)
|
|
|
|
dtb_ddr4_evk = evkddr4.dtb
|
|
@@ -208,7 +208,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(supp_dtbs)
|
|
./$(PAD_IMAGE) bl31.bin
|
|
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs)
|
|
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_ddr4_evk) $(supp_dtbs) > u-boot-ddr4-evk.its
|
|
- ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
|
|
+ mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
|
|
@rm -f u-boot.its $(dtb_ddr4_evk)
|
|
|
|
ifeq ($(HDMI),yes)
|
|
@@ -358,7 +358,6 @@ nightly :
|
|
@$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb
|
|
@$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin
|
|
@$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin
|
|
- @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/mkimage_uboot -O mkimage_uboot
|
|
|
|
archive :
|
|
git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME)
|