diff options
-rw-r--r-- | recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch | 43 | ||||
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 |
2 files changed, 22 insertions, 25 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 d05e54ad..f182a2f1 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 | |||
@@ -22,56 +22,56 @@ Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | |||
22 | iMX8M/soc.mak | 11 +++++------ | 22 | iMX8M/soc.mak | 11 +++++------ |
23 | 1 file changed, 5 insertions(+), 6 deletions(-) | 23 | 1 file changed, 5 insertions(+), 6 deletions(-) |
24 | 24 | ||
25 | diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak | 25 | Index: git/iMX8M/soc.mak |
26 | index 3486079..855c1e5 100644 | 26 | =================================================================== |
27 | --- a/iMX8M/soc.mak | 27 | --- git.orig/iMX8M/soc.mak |
28 | +++ b/iMX8M/soc.mak | 28 | +++ git/iMX8M/soc.mak |
29 | @@ -155,7 +155,7 @@ u-boot.itb: $(dtb) $(supp_dtbs) | 29 | @@ -160,7 +160,7 @@ u-boot.itb: $(dtb) $(supp_dtbs) |
30 | ./$(PAD_IMAGE) bl31.bin | 30 | ./$(PAD_IMAGE) bl31.bin |
31 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs) | 31 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs) |
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 | 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 |
33 | - ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb | 33 | - ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot.its u-boot.itb |
34 | + mkimage -E -p 0x3000 -f u-boot.its u-boot.itb | 34 | + mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot.its u-boot.itb |
35 | @rm -f u-boot.its $(dtb) | 35 | @rm -f u-boot.its $(dtb) |
36 | 36 | ||
37 | dtb_ddr3l = valddr3l.dtb | 37 | dtb_ddr3l = valddr3l.dtb |
38 | @@ -167,7 +167,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dtbs) | 38 | @@ -172,7 +172,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dt |
39 | ./$(PAD_IMAGE) bl31.bin | 39 | ./$(PAD_IMAGE) bl31.bin |
40 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs) | 40 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs) |
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 | 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 |
42 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb | 42 | - ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l.its u-boot-ddr3l.itb |
43 | + mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb | 43 | + mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l.its u-boot-ddr3l.itb |
44 | @rm -f u-boot.its $(dtb_ddr3l) | 44 | @rm -f u-boot.its $(dtb_ddr3l) |
45 | 45 | ||
46 | dtb_ddr3l_evk = evkddr3l.dtb | 46 | dtb_ddr3l_evk = evkddr3l.dtb |
47 | @@ -179,7 +179,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $(supp_dtbs) | 47 | @@ -184,7 +184,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $ |
48 | ./$(PAD_IMAGE) bl31.bin | 48 | ./$(PAD_IMAGE) bl31.bin |
49 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs) | 49 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs) |
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 | 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 |
51 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb | 51 | - ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -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 | 52 | + mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb |
53 | @rm -f u-boot.its $(dtb_ddr3l_evk) | 53 | @rm -f u-boot.its $(dtb_ddr3l_evk) |
54 | 54 | ||
55 | dtb_ddr4 = valddr4.dtb | 55 | dtb_ddr4 = valddr4.dtb |
56 | @@ -191,7 +191,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs) | 56 | @@ -196,7 +196,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs |
57 | ./$(PAD_IMAGE) bl31.bin | 57 | ./$(PAD_IMAGE) bl31.bin |
58 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs) | 58 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs) |
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 | 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 |
60 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | 60 | - ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4.its u-boot-ddr4.itb |
61 | + mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb | 61 | + mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4.its u-boot-ddr4.itb |
62 | @rm -f u-boot.its $(dtb_ddr4) | 62 | @rm -f u-boot.its $(dtb_ddr4) |
63 | 63 | ||
64 | dtb_ddr4_evk = evkddr4.dtb | 64 | dtb_ddr4_evk = evkddr4.dtb |
65 | @@ -203,7 +203,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(supp_dtbs) | 65 | @@ -208,7 +208,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(s |
66 | ./$(PAD_IMAGE) bl31.bin | 66 | ./$(PAD_IMAGE) bl31.bin |
67 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs) | 67 | ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs) |
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 | 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 |
69 | - ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb | 69 | - ./mkimage_uboot -E -p $(FIT_EXTERNAL_POSITION) -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 | 70 | + mkimage -E -p $(FIT_EXTERNAL_POSITION) -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb |
71 | @rm -f u-boot.its $(dtb_ddr4_evk) | 71 | @rm -f u-boot.its $(dtb_ddr4_evk) |
72 | 72 | ||
73 | ifeq ($(HDMI),yes) | 73 | ifeq ($(HDMI),yes) |
74 | @@ -353,7 +353,6 @@ nightly : | 74 | @@ -358,7 +358,6 @@ nightly : |
75 | @$(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 |
76 | @$(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 |
77 | @$(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 |
@@ -79,6 +79,3 @@ index 3486079..855c1e5 100644 | |||
79 | 79 | ||
80 | archive : | 80 | archive : |
81 | 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 56f3fba5..f5174811 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.22_2.0.0" | 8 | SRCBRANCH = "lf-6.1.36_2.1.0" |
9 | SRCREV = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" | 9 | SRCREV = "5a0faefc223e51e088433663b6e7d6fbce89bf59" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||