diff options
Diffstat (limited to 'recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch')
-rw-r--r-- | recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch | 25 |
1 files changed, 11 insertions, 14 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 @@ | |||
1 | From 2734c670dc4062015d05559a94fa988da5d705e6 Mon Sep 17 00:00:00 2001 | 1 | From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Andrey Zhizhikin <andrey.z@gmail.com> |
3 | Date: Thu, 21 Oct 2021 08:53:38 +0000 | 3 | Date: Thu, 21 Oct 2021 08:53:38 +0000 |
4 | Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot | 4 | Subject: [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 | ||
23 | diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak | 23 | Index: git/iMX8M/soc.mak |
24 | index 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 | -- | ||
81 | 2.17.1 | ||
82 | |||