summaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-10-30 16:08:12 -0500
committerTom Hochstein <tom.hochstein@nxp.com>2022-10-30 16:10:26 -0500
commit0a90bc6bfdc04a2e570e6f928c78dc3ec534de37 (patch)
treefe29cb487053d4e1309573d6b72e3dd7ac12a539 /recipes-bsp
parent622fec2bcc7c1c23545c305be0252ab743bde00e (diff)
downloadmeta-freescale-0a90bc6bfdc04a2e570e6f928c78dc3ec534de37.tar.gz
imx-mkimage: Update lf-5.15.32-2.0.0 to lf-5.15.52-2.1.0
Fixes: ``` 37648c8 iMX8ULP: update README for A1 silicon 46c0b5c iMX8M: use name mkeficapsule 809e209 iMX8M: use GUID for mkeficapsule c2dfe3e iMX8M: add a delete_capsule_key target 3948fde imx8ulp: Update flash_kernel for A1 part a735d32 Add MX9 autobuild. 96dba6b iMX8M: correct the path of mkimage_uboot 47e6dd4 imx8ulp: Add A1 part image build bd068a5 iMX8M: add capsule support 57a8eda makefile: compile in the specified directory fce2236 iMX93: support flash_lpboot and flash_lpboot_flexspi 400f62b imx9: Add DDR PHY FW to boot image 74b2c48 iMX93: support flash_lpboot_no_ahabfw_flexspi image 9826dea iMX93: support m33 in single boot 58b70e2 mkimage: support an optional m4 load addr option 4ee8733 Container: Update sentinel d6815e4 Container: Add Chinese Algorithm SM3 8acf49b iMX9: Add iMX93 support dc4b1e2 imx8ulp: Update flash_kernel target loading address ``` Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch25
-rw-r--r--recipes-bsp/imx-mkimage/imx-mkimage_git.inc6
2 files changed, 14 insertions, 17 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 e82b6bee..a8b0332d 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,4 +1,4 @@
1From 2734c670dc4062015d05559a94fa988da5d705e6 Mon Sep 17 00:00:00 2001 1From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com> 2From: Andrey Zhizhikin <andrey.z@gmail.com>
3Date: Thu, 21 Oct 2021 08:53:38 +0000 3Date: Thu, 21 Oct 2021 08:53:38 +0000
4Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot 4Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot
@@ -20,14 +20,14 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
20 iMX8M/soc.mak | 11 +++++------ 20 iMX8M/soc.mak | 11 +++++------
21 1 file changed, 5 insertions(+), 6 deletions(-) 21 1 file changed, 5 insertions(+), 6 deletions(-)
22 22
23diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak 23Index: git/iMX8M/soc.mak
24index a98195e..60502d8 100644 24===================================================================
25--- a/iMX8M/soc.mak 25--- git.orig/iMX8M/soc.mak
26+++ b/iMX8M/soc.mak 26+++ git/iMX8M/soc.mak
27@@ -149,7 +149,7 @@ u-boot.itb: $(dtb) 27@@ -149,7 +149,7 @@ u-boot.itb: $(dtb)
28 ./$(PAD_IMAGE) bl31.bin 28 ./$(PAD_IMAGE) bl31.bin
29 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) 29 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
30 BL32=$(TEE) 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 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
31- ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb 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 32+ mkimage -E -p 0x3000 -f u-boot.its u-boot.itb
33 @rm -f u-boot.its $(dtb) 33 @rm -f u-boot.its $(dtb)
@@ -36,7 +36,7 @@ index a98195e..60502d8 100644
36@@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) 36@@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l)
37 ./$(PAD_IMAGE) bl31.bin 37 ./$(PAD_IMAGE) bl31.bin
38 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) 38 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_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 $(dtb_ddr3l) > u-boot-ddr3l.its 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
40- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb 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 41+ mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
42 @rm -f u-boot.its $(dtb_ddr3l) 42 @rm -f u-boot.its $(dtb_ddr3l)
@@ -45,7 +45,7 @@ index a98195e..60502d8 100644
45@@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) 45@@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk)
46 ./$(PAD_IMAGE) bl31.bin 46 ./$(PAD_IMAGE) bl31.bin
47 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) 47 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk)
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 $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its 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
49- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb 49- ./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 50+ mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
51 @rm -f u-boot.its $(dtb_ddr3l_evk) 51 @rm -f u-boot.its $(dtb_ddr3l_evk)
@@ -54,7 +54,7 @@ index a98195e..60502d8 100644
54@@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) 54@@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4)
55 ./$(PAD_IMAGE) bl31.bin 55 ./$(PAD_IMAGE) bl31.bin
56 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) 56 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4)
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 $(dtb_ddr4) > u-boot-ddr4.its 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
58- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb 58- ./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 59+ mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
60 @rm -f u-boot.its $(dtb_ddr4) 60 @rm -f u-boot.its $(dtb_ddr4)
@@ -63,13 +63,13 @@ index a98195e..60502d8 100644
63@@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) 63@@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk)
64 ./$(PAD_IMAGE) bl31.bin 64 ./$(PAD_IMAGE) bl31.bin
65 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) 65 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk)
66 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_ddr4_evk) > u-boot-ddr4-evk.its 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
67- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb 67- ./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 68+ mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
69 @rm -f u-boot.its $(dtb_ddr4_evk) 69 @rm -f u-boot.its $(dtb_ddr4_evk)
70 70
71 ifeq ($(HDMI),yes) 71 ifeq ($(HDMI),yes)
72@@ -318,7 +318,6 @@ nightly : 72@@ -343,7 +343,6 @@ nightly :
73 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb 73 @$(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 74 @$(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 75 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin
@@ -77,6 +77,3 @@ index a98195e..60502d8 100644
77 77
78 archive : 78 archive :
79 git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) 79 git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME)
80--
812.17.1
82
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 6db6a883..453ef0ed 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -2,11 +2,11 @@
2 2
3DEPENDS = "zlib-native openssl-native" 3DEPENDS = "zlib-native openssl-native"
4 4
5SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ 5SRC_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"
8SRCBRANCH = "lf-5.15.32_2.0.0" 8SRCBRANCH = "lf-5.15.52_2.1.0"
9SRCREV = "a8bb8edb45492ac70b33734122a57aa8e38a20bd" 9SRCREV = "37648c8ba5094420faa8206d8cb8e0c6f17d72fc"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12