From 1650359bc3eba454522f0db51846497549275caa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 1 Aug 2022 14:44:05 -0300 Subject: imx8m*-evk: allow switch between `u-boot-imx` and `u-boot-fslc` We ought to add `imx-boot-container` `MACHINEOVERRIDES` only if not building for `u-boot-imx`. This can be removed once it uses `binman` as `u-boot-imx` and u-boot-fslc would use same mechanism to build the container. Signed-off-by: Otavio Salvador --- conf/machine/include/imx8mm-evk.inc | 6 +++++- conf/machine/include/imx8mn-evk.inc | 6 +++++- conf/machine/include/imx8mp-evk.inc | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 6d317f11..f124b8f6 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8mm:" +MACHINEOVERRIDES =. "mx8mm:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 2f2c02f9..261c9b53 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8mn:" +MACHINEOVERRIDES =. "mx8mn:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index d93557d2..1b83e677 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -1,4 +1,8 @@ -MACHINEOVERRIDES =. "imx-boot-container:mx8mp:" +MACHINEOVERRIDES =. "mx8mp:" + +# FIXME: u-boot-imx should be converted to `binman` and then we can +# avoid this specific overrides and handle it in a generic way. +MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc -- cgit v1.2.3-54-g00ecf