From 7494e9e268a056a423ed917261af8978ba14a648 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 1 May 2023 13:48:41 +0200 Subject: u-boot: imx-boot: build with u-boot binman The imx-boot binary can be put together with the imx-mkimage/imx-boot recipe or now also with U-Boot/binman. meta-freescale changed the default for all machines from using imx-mkimage to use binman. Move to use binman, change the downstream U-Boot recipe accordingly. Related-to: ELB-5155 Signed-off-by: Max Krummenacher --- conf/machine/verdin-imx8mm.conf | 2 -- conf/machine/verdin-imx8mp.conf | 2 -- recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index cd2b296..4033ae9 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -84,8 +84,6 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_VERSION_u-boot-toradex = "2022.04%" # With use-mainline-bsp build mainline U-Boot PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%" -# if using the mainline u-boot, build imx-boot from within u-boot -MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:" # variables to control imx-boot with u-boot ATF_LOAD_ADDR = "0x920000" IMX_EXTRA_FIRMWARE = "firmware-imx-8m" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index b62a140..0a1d4fd 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -85,8 +85,6 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-toradex" PREFERRED_VERSION_u-boot-toradex = "2022.04%" # With use-mainline-bsp build mainline U-Boot PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%" -# if using the mainline u-boot, build imx-boot from within u-boot -MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:" # variables to control imx-boot with u-boot ATF_LOAD_ADDR = "0x920000" IMX_EXTRA_FIRMWARE = "firmware-imx-8m" diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc index 67a693d..b6b6ccb 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc +++ b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc @@ -14,6 +14,8 @@ SRCBRANCH = "toradex_imx_lf_v2022.04" S = "${WORKDIR}/git" inherit toradex-u-boot-localversion +# build imx-boot from within U-Boot +inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} UBOOT_INITIAL_ENV = "u-boot-initial-env" -- cgit v1.2.3