imx93: rearrange repeated overrides

The three machines require imx93-evk.inc, and the mx93 override is
common to all of them, so it can be moved to imx93-evk.inc to avoid
repetition.

Signed-off-by: Joao Marcos Costa <joaomarcos.costa@bootlin.com>

4 files changed, 1 insertions, 6 deletions

diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index a56b18ec..159a4472 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -4,8 +4,6 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 93 11x11 EVK with LPDDR4X
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx93:"
-
 require include/imx93-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx93-11x11-evk"
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 56b8a3c5..9ac24b65 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -4,8 +4,6 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX 93 14x14 EVK with LPDDR4X
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx93:"
-
 require conf/machine/include/imx93-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk"
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
index f6e7f3a6..3ccd6fd7 100644
--- a/conf/machine/imx93-9x9-lpddr4-qsb.conf
+++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -4,8 +4,6 @@
 #@DESCRIPTION: Machine configuration for NXP i.MX93 9x9 QSB with LPDDR4
 #@MAINTAINER: Jun Zhu <junzhu@nxp.com>
 
-MACHINEOVERRIDES =. "mx93:"
-
 require include/imx93-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "imx93-9x9-qsb"
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index d3655c29..0647a66e 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -1,6 +1,7 @@
 require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
 
+MACHINEOVERRIDES =. "mx93:"
 MACHINE_FEATURES += "pci wifi bluetooth"
 MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio"