diff options
Diffstat (limited to 'recipes-bsp/imx-mkimage/files')
-rw-r--r-- | recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch new file mode 100644 index 00000000..be8c78aa --- /dev/null +++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | From fe3d11ae2886f00ff57e2a3d20cdae02cca28234 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | ||
3 | Date: Thu, 21 Oct 2021 08:53:38 +0000 | ||
4 | Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot | ||
5 | |||
6 | mkimage tool is provided as a part of sysroot from Yocto build. Current | ||
7 | implementation on the imx-mkimge on the other hand copies it locally in | ||
8 | order to invoke it from within the build folder. | ||
9 | |||
10 | Since recent updates, mkimage requires openssl.so to be installed, which | ||
11 | when local copy is used causes the tool not to operate and fails the | ||
12 | build. | ||
13 | |||
14 | Use it from the build sysroot, and do not pull the local version of it. | ||
15 | |||
16 | Upstream-Status: Inappropriate [OE-specific] | ||
17 | |||
18 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | ||
19 | --- | ||
20 | iMX8M/soc.mak | 9 ++++----- | ||
21 | 1 file changed, 4 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak | ||
24 | index b7b3986..ca00411 100644 | ||
25 | --- a/iMX8M/soc.mak | ||
26 | +++ b/iMX8M/soc.mak | ||
27 | @@ -142,7 +142,7 @@ u-boot.itb: $(dtbs) | ||
28 | ./$(PAD_IMAGE) bl31.bin | ||
29 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) | ||
30 | 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 | ||
31 | - ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb | ||
32 | + mkimage -E -p 0x3000 -f u-boot.its u-boot.itb | ||
33 | @rm -f u-boot.its $(dtbs) | ||
34 | |||
35 | dtbs_ddr3l = valddr3l.dtb | ||
36 | @@ -154,7 +154,7 @@ u-boot-ddr3l.itb: $(dtbs_ddr3l) | ||
37 | ./$(PAD_IMAGE) bl31.bin | ||
38 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr3l) | ||
39 | 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_ddr3l) > u-boot-ddr3l.its | ||
40 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb | ||
41 | + mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb | ||
42 | @rm -f u-boot.its $(dtbs_ddr3l) | ||
43 | |||
44 | dtbs_ddr4 = valddr4.dtb | ||
45 | @@ -166,7 +166,7 @@ u-boot-ddr4.itb: $(dtbs_ddr4) | ||
46 | ./$(PAD_IMAGE) bl31.bin | ||
47 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4) | ||
48 | 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_ddr4) > u-boot-ddr4.its | ||
49 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | ||
50 | + mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | ||
51 | @rm -f u-boot.its $(dtbs_ddr4) | ||
52 | |||
53 | dtbs_ddr4_evk = evkddr4.dtb | ||
54 | @@ -178,7 +178,7 @@ u-boot-ddr4-evk.itb: $(dtbs_ddr4_evk) | ||
55 | ./$(PAD_IMAGE) bl31.bin | ||
56 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk) | ||
57 | 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_ddr4_evk) > u-boot-ddr4-evk.its | ||
58 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb | ||
59 | + mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb | ||
60 | @rm -f u-boot.its $(dtbs_ddr4_evk) | ||
61 | |||
62 | ifeq ($(HDMI),yes) | ||
63 | @@ -285,7 +285,6 @@ nightly : | ||
64 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb | ||
65 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin | ||
66 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin | ||
67 | - @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/mkimage_uboot -O mkimage_uboot | ||
68 | |||
69 | archive : | ||
70 | git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) | ||