diff options
author | Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | 2023-07-18 13:43:32 +0300 |
---|---|---|
committer | Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | 2023-07-20 12:52:03 +0300 |
commit | 3aea28136dba302e711d16e2c4935994808e72a4 (patch) | |
tree | 585ed7276feccf19c5d34fb7105b5b1dae7c08a8 | |
parent | 52fa68c24a1252eda3399ed40838c2be280ba4ef (diff) | |
download | meta-freescale-3aea28136dba302e711d16e2c4935994808e72a4.tar.gz |
imx-mkimage: Update lf-6.1.1_1.0.0 to lf-6.1.22_2.0.0
Relevant changes:
- 5cfd218 MA-21144 imx8m: fix pad_image script
- 1752a0a imx8ulp: Change to use A2 as default REV
- d523fce imx8m: Add Multiple u-boot DTB support to FIT
- 4981b77 MA-21096 Fix tee.bin can't be compressed as expected on 8ulp/8q.
- ac12242 MA-21092 Adjust print log for compressed tee.bin
Refresh the patch for fixing mkimage_uboot issue for imx8m machines.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
-rw-r--r-- | recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch | 55 | ||||
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 |
2 files changed, 32 insertions, 27 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 index a8b0332d..d05e54ad 100644 --- 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001 | 1 | From 3e0f78a4efeac4ea0651ac763099d780447a18b4 Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io> |
3 | Date: Thu, 21 Oct 2021 08:53:38 +0000 | 3 | Date: Wed, 19 Jul 2023 18:34:32 +0300 |
4 | Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot | 4 | Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot |
5 | 5 | ||
6 | mkimage tool is provided as a part of sysroot from Yocto build. Current | 6 | mkimage tool is provided as a part of sysroot from Yocto build. Current |
@@ -13,63 +13,65 @@ build. | |||
13 | 13 | ||
14 | Use it from the build sysroot, and do not pull the local version of it. | 14 | Use it from the build sysroot, and do not pull the local version of it. |
15 | 15 | ||
16 | Upstream-Status: Inappropriate [OE-specific] | 16 | Reinjected the original patch from Andrey Zhizhikin <andrey.z@gmail.com> |
17 | 17 | ||
18 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | 18 | Upstream-Status: Inappropriate [OE-specific] |
19 | Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | ||
19 | --- | 20 | --- |
21 | |||
20 | iMX8M/soc.mak | 11 +++++------ | 22 | iMX8M/soc.mak | 11 +++++------ |
21 | 1 file changed, 5 insertions(+), 6 deletions(-) | 23 | 1 file changed, 5 insertions(+), 6 deletions(-) |
22 | 24 | ||
23 | Index: git/iMX8M/soc.mak | 25 | diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak |
24 | =================================================================== | 26 | index 3486079..855c1e5 100644 |
25 | --- git.orig/iMX8M/soc.mak | 27 | --- a/iMX8M/soc.mak |
26 | +++ git/iMX8M/soc.mak | 28 | +++ b/iMX8M/soc.mak |
27 | @@ -149,7 +149,7 @@ u-boot.itb: $(dtb) | 29 | @@ -155,7 +155,7 @@ u-boot.itb: $(dtb) $(supp_dtbs) |
28 | ./$(PAD_IMAGE) bl31.bin | 30 | ./$(PAD_IMAGE) bl31.bin |
29 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) | 31 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs) |
30 | 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) > u-boot.its | 32 | 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 |
31 | - ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb | 33 | - ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb |
32 | + mkimage -E -p 0x3000 -f u-boot.its u-boot.itb | 34 | + mkimage -E -p 0x3000 -f u-boot.its u-boot.itb |
33 | @rm -f u-boot.its $(dtb) | 35 | @rm -f u-boot.its $(dtb) |
34 | 36 | ||
35 | dtb_ddr3l = valddr3l.dtb | 37 | dtb_ddr3l = valddr3l.dtb |
36 | @@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) | 38 | @@ -167,7 +167,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dtbs) |
37 | ./$(PAD_IMAGE) bl31.bin | 39 | ./$(PAD_IMAGE) bl31.bin |
38 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) | 40 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs) |
39 | 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) > u-boot-ddr3l.its | 41 | 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 |
40 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb | 42 | - ./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 | 43 | + mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb |
42 | @rm -f u-boot.its $(dtb_ddr3l) | 44 | @rm -f u-boot.its $(dtb_ddr3l) |
43 | 45 | ||
44 | dtb_ddr3l_evk = evkddr3l.dtb | 46 | dtb_ddr3l_evk = evkddr3l.dtb |
45 | @@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) | 47 | @@ -179,7 +179,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $(supp_dtbs) |
46 | ./$(PAD_IMAGE) bl31.bin | 48 | ./$(PAD_IMAGE) bl31.bin |
47 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) | 49 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs) |
48 | 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) > u-boot-ddr3l-evk.its | 50 | 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 |
49 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb | 51 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb |
50 | + mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb | 52 | + mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb |
51 | @rm -f u-boot.its $(dtb_ddr3l_evk) | 53 | @rm -f u-boot.its $(dtb_ddr3l_evk) |
52 | 54 | ||
53 | dtb_ddr4 = valddr4.dtb | 55 | dtb_ddr4 = valddr4.dtb |
54 | @@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) | 56 | @@ -191,7 +191,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs) |
55 | ./$(PAD_IMAGE) bl31.bin | 57 | ./$(PAD_IMAGE) bl31.bin |
56 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) | 58 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs) |
57 | 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) > u-boot-ddr4.its | 59 | 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 |
58 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | 60 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb |
59 | + mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | 61 | + mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb |
60 | @rm -f u-boot.its $(dtb_ddr4) | 62 | @rm -f u-boot.its $(dtb_ddr4) |
61 | 63 | ||
62 | dtb_ddr4_evk = evkddr4.dtb | 64 | dtb_ddr4_evk = evkddr4.dtb |
63 | @@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) | 65 | @@ -203,7 +203,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(supp_dtbs) |
64 | ./$(PAD_IMAGE) bl31.bin | 66 | ./$(PAD_IMAGE) bl31.bin |
65 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) | 67 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs) |
66 | 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) > u-boot-ddr4-evk.its | 68 | 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 |
67 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb | 69 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb |
68 | + mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb | 70 | + mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb |
69 | @rm -f u-boot.its $(dtb_ddr4_evk) | 71 | @rm -f u-boot.its $(dtb_ddr4_evk) |
70 | 72 | ||
71 | ifeq ($(HDMI),yes) | 73 | ifeq ($(HDMI),yes) |
72 | @@ -343,7 +343,6 @@ nightly : | 74 | @@ -353,7 +353,6 @@ nightly : |
73 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb | 75 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb |
74 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin | 76 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin |
75 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin | 77 | @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin |
@@ -77,3 +79,6 @@ Index: git/iMX8M/soc.mak | |||
77 | 79 | ||
78 | archive : | 80 | archive : |
79 | git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) | 81 | git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) |
82 | -- | ||
83 | 2.40.1 | ||
84 | |||
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index 3e2e939a..56f3fba5 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc | |||
@@ -5,8 +5,8 @@ DEPENDS = "zlib-native openssl-native" | |||
5 | SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ | 5 | SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ |
6 | file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ | 6 | file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ |
7 | " | 7 | " |
8 | SRCBRANCH = "lf-6.1.1_1.0.0" | 8 | SRCBRANCH = "lf-6.1.22_2.0.0" |
9 | SRCREV = "d489494622585a47b4be88988595b0e4f9598f39" | 9 | SRCREV = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||