From 42b35e3c98876c2e8aa4294f1a378e0a826b4e3d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 2 Aug 2022 13:04:15 -0500 Subject: imx8m*: Drop redundant UBOOT_SUFFIX assignment Signed-off-by: Tom Hochstein (cherry picked from commit d3f8b15d3cab77ae0397ab95ddcb4aed559e2db0) --- conf/machine/imx8mq-evk.conf | 1 - conf/machine/include/imx8mm-evk.inc | 1 - conf/machine/include/imx8mn-evk.inc | 1 - conf/machine/include/imx8mp-evk.inc | 1 - 4 files changed, 4 deletions(-) diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index ace29424..c1abe991 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -96,7 +96,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp ??= "root=/dev/mmcblk1p2" IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "" IMX_BOOT_SEEK = "33" diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index f124b8f6..36d3bd9a 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -67,7 +67,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2" IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" IMX_BOOT_SEEK = "33" diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 261c9b53..4b3b3d22 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -73,7 +73,6 @@ IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.con BOOT_SPACE = "65536" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" # Image boot offset as defined in section 6.1.6.1 "Primary image offset and IVT offset" of diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 1b83e677..2f630ab4 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -69,7 +69,6 @@ UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2" IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" LOADADDR = "" -UBOOT_SUFFIX = "bin" UBOOT_MAKE_TARGET = "all" IMX_BOOT_SEEK = "32" -- cgit v1.2.3-54-g00ecf From 1733bf1dd19b0681122099d84cb758197c8fd898 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 2 Aug 2022 13:05:31 -0500 Subject: imx6ulevk.conf: Add missing overrides for u-boot-imx-mfgtool Signed-off-by: Tom Hochstein (cherry picked from commit 6569140c9f390681a21e714f48e90ec0ae642908) --- conf/machine/imx6ulevk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 8f908efe..216f47bd 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -32,7 +32,9 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img" # The u-boot-imx does not provide SPL support SPL_BINARY:pn-u-boot-imx = "" UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" +UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" +UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx" WKS_FILE = " \ ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ -- cgit v1.2.3-54-g00ecf From 42cb2e70466293a1cc9b3aea79c9f167e4fd7aeb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 2 Aug 2022 13:06:30 -0500 Subject: imx-base.inc: Expand comment for UBOOT_SUFFIX The UBOOT_SUFFIX override is complex and makes a requirement on the machine config that is easy to overlook, namely that it will evaluate incorrectly to empty if the variable is not overridden in some form by the machine config. Signed-off-by: Tom Hochstein (cherry picked from commit 526798901506f890f5682ff31a00ba1ea7b31331) --- conf/machine/include/imx-base.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 2962c9e9..cc55d327 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -60,6 +60,14 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" # | # | UBOOT_MACHINE = "mx53loco_config" # `---- +# +# Please note that UBOOT_SUFFIX must be set in the machine config even +# if the value is the same for the U-Boot flavors. If the value is not +# set, then the assignment here is the one used, the value resolves to +# empty, and the build fails: +# | cp: cannot stat '/.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/imx8qm_mek_defconfig/u-boot.': No such file or directory +#| WARNING: /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/temp/run.do_compile.21223:186 exit 1 from 'cp /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/${binary} /.../tmp/work/imx8qm_mek-fsl-linux/u-boot-imx/2022.04-r0/build/${config}/u-boot-${type}.${UBOOT_SUFFIX:pn-u-boot-imx}' +# IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}" -- cgit v1.2.3-54-g00ecf