Skip to content

Commit 2655f05

Browse files
committed
layer.conf: Fix u-boot-imx overrides for i.MX 8
u-boot-imx builds are broken for i.MX 8: ``` install: cannot stat '.../tmp/work/imx8qm_mek-poky-linux/u-boot-imx/1_2020.04-r0/git/imx8qm_mek_defconfig/spl/u-boot-spl.bin': No such file or directory ``` This is because the overrides added recently for UBOOT_MAKE_TARGET and UBOOT_SUFFIX are incorrect for i.MX 8. Limit the overrides to i.MX 6 and 7. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
1 parent d5e5627 commit 2655f05

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

meta-bsp/conf/layer.conf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ IMX_DEFAULT_BSP = "nxp"
4545
# override it here.
4646
IMX_DEFAULT_BOOTLOADER_imx = "u-boot-imx"
4747

48-
UBOOT_MAKE_TARGET_pn-u-boot-imx ?= "u-boot.${UBOOT_SUFFIX}"
49-
UBOOT_SUFFIX_pn-u-boot-imx ?= "imx"
48+
UBOOT_MAKE_TARGET_pn-u-boot-imx_mx6 = "u-boot.imx"
49+
UBOOT_MAKE_TARGET_pn-u-boot-imx_mx7 = "u-boot.imx"
50+
UBOOT_SUFFIX_pn-u-boot-imx_mx6 = "imx"
51+
UBOOT_SUFFIX_pn-u-boot-imx_mx7 = "imx"
5052

5153
# Avoid multiple runtime providers for u-boot-default-env
5254
PREFERRED_RPROVIDER_u-boot-default-env ??= "${IMX_DEFAULT_BOOTLOADER}"

0 commit comments

Comments
 (0)