Remove conditional imx-boot-container MACHINEOVERRIDES

The imx-boot-container MACHINEOVERRIDES allows the bootloader recipe to
enable the binman support for the SoCs which uses it. The conditional
belongs to the bootloader recipe and can be removed from machines.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

5 files changed, 5 insertions, 21 deletions

diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index 9d7bafd6..01a8d736 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 8M Nano UltraLite Evaluation Kit with DDR3L
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "imx-boot-container:mx8mnul:"
+MACHINEOVERRIDES =. "mx8mnul:imx-boot-container:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 779ac478..dba1bcd9 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -4,11 +4,7 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 8M Quad Evaluation Kit
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx8mq:"
-
-# 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)}"
+MACHINEOVERRIDES =. "mx8mq:imx-boot-container:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 507da6aa..327f42cf 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -1,8 +1,4 @@
-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)}"
+MACHINEOVERRIDES =. "mx8mm:imx-boot-container:"
 
 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 f44b7a9d..b5fcc7bc 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,8 +1,4 @@
-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)}"
+MACHINEOVERRIDES =. "mx8mn:imx-boot-container:"
 
 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 8866331c..a30e8efb 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -1,8 +1,4 @@
-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)}"
+MACHINEOVERRIDES =. "mx8mp:imx-boot-container:"
 
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8a/tune-cortexa53.inc