From 46c1c813167eef1ab941be896162aafecb91d43d Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 13 Aug 2021 23:19:47 +0200 Subject: [PATCH 1/2] imx7s-warp: Set UBOOT_SUFFIX to imx Since commit 776932e187f38ca53ed57fc662461ba0da005520 ("Rework the u-boot-fslc and u-boot-imx settings logic") in [1], we need to override the default imx-base.inc value that uses UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER} Fixes: ./tools/mkimage -n u-boot-dtb.cfgout -T imximage -e 0x87800000 -d u-boot-dtb.bin u-boot-dtb.imx >u-boot-dtb.imx.log && cat u-boot-dtb.imx.log Image Type: Freescale IMX Boot Image Image Ver: 2 (i.MX53/6/7 compatible) Mode: DCD Data Size: 458848 Bytes = 448.09 KiB = 0.44 MiB Load Address: 877ff420 Entry Point: 87800000 HAB Blocks: 0x877ff400 0x00000000 0x0006dc00 DCD Blocks: 0x00910000 0x0000002c 0x000001d4 make[1]: Leaving directory '/home/bdx-iot/ci/build/tmp/work/imx7s_warp-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/build/warp7_defconfig' make: Leaving directory '/home/bdx-iot/ci/build/tmp/work/imx7s_warp-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/git' /home/bdx-iot/ci/build/tmp/work/imx7s_warp-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/temp/run.do_compile.2814200: 187: Bad substitution WARNING: exit code 2 from a shell command. See [2] [1] - https://github.com/Freescale/meta-freescale/commit/776932e187f38ca53ed57fc662461ba0da005520 [2] - https://github.com/Freescale/meta-freescale/pull/837#issuecomment-897974255 Signed-off-by: Pierre-Jean Texier --- conf/machine/imx7s-warp.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf index f76386b..59398ec 100644 --- a/conf/machine/imx7s-warp.conf +++ b/conf/machine/imx7s-warp.conf @@ -16,6 +16,7 @@ MACHINE_FEATURES += " wifi bluetooth" KERNEL_DEVICETREE = "imx7s-warp.dtb" UBOOT_BINARY = "u-boot-dtb.imx" +UBOOT_SUFFIX = "imx" UBOOT_MAKE_TARGET = "" UBOOT_CONFIG ??= "sd" From 7670b84e93d70b0a9129dc46d98b315b06532d32 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 13 Aug 2021 23:24:02 +0200 Subject: [PATCH 2/2] imx7d-pico: Set UBOOT_SUFFIX to img Since commit 776932e187f38ca53ed57fc662461ba0da005520 ("Rework the u-boot-fslc and u-boot-imx settings logic") in [1], we need to override the default imx-base.inc value that uses UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER} Fixes: | ./tools/mkimage -n spl/u-boot-spl.cfgout -T imximage -e 0x00912000 -d spl/u-boot-spl.bin SPL >SPL.log && cat SPL.log | Image Type: Freescale IMX Boot Image | Image Ver: 2 (i.MX53/6/7 compatible) | Mode: DCD | Data Size: 45056 Bytes = 44.00 KiB = 0.04 MiB | Load Address: 00911420 | Entry Point: 00912000 | make[1]: Leaving directory '/build/tmp/work/imx7d_pico-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/build/pico-dwarf-imx7d_defconfig' | make: Leaving directory '/build/tmp/work/imx7d_pico-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/git' | /build/tmp/work/imx7d_pico-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/temp/run.do_compile.1244816: 187: /build/tmp/work/imx7d_pico-poky-linux-gnueabi/u-boot-fslc/v2021.07+gitAUTOINC+587e796995-r0/temp/run.do_compile.1244816: Bad substitution See [2] [1] - https://github.com/Freescale/meta-freescale/commit/776932e187f38ca53ed57fc662461ba0da005520 [2] - https://github.com/Freescale/meta-freescale/pull/837#issuecomment-897974255 Signed-off-by: Pierre-Jean Texier --- conf/machine/imx7d-pico.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/imx7d-pico.conf b/conf/machine/imx7d-pico.conf index 5e67a7f..4e67e78 100644 --- a/conf/machine/imx7d-pico.conf +++ b/conf/machine/imx7d-pico.conf @@ -22,6 +22,7 @@ KERNEL_DEVICETREE = " \ SPL_BINARY = "SPL" UBOOT_BINARY = "u-boot-dtb.img" +UBOOT_SUFFIX = "img" UBOOT_MAKE_TARGET = "" UBOOT_CONFIG ??= "dwarf hobbit nymph pi generic"