From d55dbce7ae511ca5a918b3a40b812ad67ecb4691 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 11 Oct 2023 11:20:35 +0200 Subject: [PATCH] imx-boot, imx-mkimage: update to NXP's lf-6.1.36-2.1.0 release for ccimx93 Signed-off-by: Javier Viguera --- ...k-capture-commands-output-into-a-log-file.patch | 14 +++++++------- .../recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 6 +++--- .../imx-mkimage/imx-mkimage_git.bbappend | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch index 763f23979..9668a97fd 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/files/0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch @@ -11,7 +11,7 @@ Signed-off-by: Javier Viguera 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/iMX9/soc.mak b/iMX9/soc.mak -index 7c4086c153d0..7ec4bb5eaeb4 100644 +index 6d4613dd7d92..97e311059df8 100644 --- a/iMX9/soc.mak +++ b/iMX9/soc.mak @@ -1,4 +1,5 @@ @@ -20,17 +20,17 @@ index 7c4086c153d0..7ec4bb5eaeb4 100644 CC ?= gcc 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; \ 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; \ - fi + fi | tee $(MKIMAGE_LOG) - .PHONY: clean nightly - clean: -@@ -80,11 +81,11 @@ clean: - @echo "imx8ulp clean done" + u-boot-atf-container-spinand.img: bl31.bin u-boot-hash.bin + if [ -f tee.bin ]; then \ +@@ -125,11 +126,11 @@ clean: + @echo "imx9 clean done" 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 @@ -42,4 +42,4 @@ index 7c4086c153d0..7ec4bb5eaeb4 100644 + 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; - 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 diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index d54d26b15..19d80d9f9 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -11,10 +11,10 @@ SRC_URI:append:ccimx93 = " \ 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}" -SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0" -SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" +SRCBRANCH:ccimx93 = "lf-6.1.36_2.1.0" +SRCREV:ccimx93 = "5a0faefc223e51e088433663b6e7d6fbce89bf59" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend index 18a4a08c3..b40e5563b 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend @@ -6,10 +6,10 @@ SRC_URI:append:ccimx8m = " \ 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}" -SRCBRANCH:ccimx93 = "lf-6.1.22_2.0.0" -SRCREV:ccimx93 = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9" +SRCBRANCH:ccimx93 = "lf-6.1.36_2.1.0" +SRCREV:ccimx93 = "5a0faefc223e51e088433663b6e7d6fbce89bf59" # "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}"