Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx-boot, imx-mkimage: update to NXP's lf-6.1.36-2.1.0 release for ccimx93 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-10-11 11:20:35 +02:00
parent 4f453efd89
commit d55dbce7ae
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/iMX9/soc.mak b/iMX9/soc.mak diff --git a/iMX9/soc.mak b/iMX9/soc.mak
index 7c4086c153d0..7ec4bb5eaeb4 100644 index 6d4613dd7d92..97e311059df8 100644
--- a/iMX9/soc.mak --- a/iMX9/soc.mak
+++ b/iMX9/soc.mak +++ b/iMX9/soc.mak
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
@ -20,17 +20,17 @@ index 7c4086c153d0..7ec4bb5eaeb4 100644
CC ?= gcc CC ?= gcc
REV ?= A0 REV ?= A0
@@ -71,7 +72,7 @@ u-boot-atf-container.img: bl31.bin u-boot-hash.bin @@ -98,7 +99,7 @@ u-boot-atf-container.img: bl31.bin u-boot-hash.bin
fi; \ fi; \
else \ else \
./$(MKIMG) -soc IMX9 -c -ap bl31.bin a35 $(ATF_LOAD_ADDR) -ap u-boot-hash.bin a35 $(UBOOT_LOAD_ADDR) -out u-boot-atf-container.img; \ ./$(MKIMG) -soc IMX9 -c -ap bl31.bin a35 $(ATF_LOAD_ADDR) -ap u-boot-hash.bin a35 $(UBOOT_LOAD_ADDR) -out u-boot-atf-container.img; \
- fi - fi
+ fi | tee $(MKIMAGE_LOG) + fi | tee $(MKIMAGE_LOG)
.PHONY: clean nightly u-boot-atf-container-spinand.img: bl31.bin u-boot-hash.bin
clean: if [ -f tee.bin ]; then \
@@ -80,11 +81,11 @@ clean: @@ -125,11 +126,11 @@ clean:
@echo "imx8ulp clean done" @echo "imx9 clean done"
flash_singleboot: $(MKIMG) $(AHAB_IMG) u-boot-spl-ddr.bin u-boot-atf-container.img flash_singleboot: $(MKIMG) $(AHAB_IMG) u-boot-spl-ddr.bin u-boot-atf-container.img
- ./$(MKIMG) -soc IMX9 -append $(AHAB_IMG) -c -ap u-boot-spl-ddr.bin a35 $(SPL_LOAD_ADDR) -out flash.bin - ./$(MKIMG) -soc IMX9 -append $(AHAB_IMG) -c -ap u-boot-spl-ddr.bin a35 $(SPL_LOAD_ADDR) -out flash.bin
@ -42,4 +42,4 @@ index 7c4086c153d0..7ec4bb5eaeb4 100644
+ echo "append u-boot-atf-container.img at $$pad_cnt KB" | tee -a $(MKIMAGE_LOG); \ + echo "append u-boot-atf-container.img at $$pad_cnt KB" | tee -a $(MKIMAGE_LOG); \
dd if=u-boot-atf-container.img of=flash.bin bs=1K seek=$$pad_cnt; dd if=u-boot-atf-container.img of=flash.bin bs=1K seek=$$pad_cnt;
flash_singleboot_flexspi: $(MKIMG) $(AHAB_IMG) u-boot-spl-ddr.bin u-boot-atf-container.img flash_singleboot_spinand: $(MKIMG) $(AHAB_IMG) u-boot-spl-ddr.bin u-boot-atf-container-spinand.img flash_fw.bin

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
View File

@ -11,10 +11,10 @@ SRC_URI:append:ccimx93 = " \
file://0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch \ file://0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch \
" "
# Use NXP's lf-6.1.22-2.0.0 release for ccimx93 # Use NXP's lf-6.1.36-2.1.0 release for ccimx93
SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0" SRCBRANCH:ccimx93 = "lf-6.1.36_2.1.0"
SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" SRCREV:ccimx93 = "5a0faefc223e51e088433663b6e7d6fbce89bf59"
DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
View File

@ -6,10 +6,10 @@ SRC_URI:append:ccimx8m = " \
file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \ file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \
" "
# Use NXP's lf-6.1.22-2.0.0 release for ccimx93 # Use NXP's lf-6.1.36-2.1.0 release for ccimx93
SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0" SRCBRANCH:ccimx93 = "lf-6.1.36_2.1.0"
SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" SRCREV:ccimx93 = "5a0faefc223e51e088433663b6e7d6fbce89bf59"
# "fmacro-prefix-map" is not supported on old versions of GCC # "fmacro-prefix-map" is not supported on old versions of GCC
DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"