summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoao Marcos Costa <joaomarcos.costa@bootlin.com>2023-12-28 14:44:56 +0100
committerJoao Marcos Costa <joaomarcos.costa@bootlin.com>2023-12-28 14:44:56 +0100
commitd5d1cdfaa9dc82229f35334f9808a0f079de6397 (patch)
tree83071ce0c2ff0d6e5cfad65bed7ab1a2dcf57a70
parent751102ef2e194c3bf517b4ab9673fff62fd956f3 (diff)
downloadmeta-freescale-d5d1cdfaa9dc82229f35334f9808a0f079de6397.tar.gz
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>
-rw-r--r--conf/machine/imx93-11x11-lpddr4x-evk.conf2
-rw-r--r--conf/machine/imx93-14x14-lpddr4x-evk.conf2
-rw-r--r--conf/machine/imx93-9x9-lpddr4-qsb.conf2
-rw-r--r--conf/machine/include/imx93-evk.inc1
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 @@
4#@DESCRIPTION: Machine configuration for NXP i.MX 93 11x11 EVK with LPDDR4X 4#@DESCRIPTION: Machine configuration for NXP i.MX 93 11x11 EVK with LPDDR4X
5#@MAINTAINER: Jun Zhu <junzhu@nxp.com> 5#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
6 6
7MACHINEOVERRIDES =. "mx93:"
8
9require include/imx93-evk.inc 7require include/imx93-evk.inc
10 8
11KERNEL_DEVICETREE_BASENAME = "imx93-11x11-evk" 9KERNEL_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 @@
4#@DESCRIPTION: Machine configuration for NXP i.MX 93 14x14 EVK with LPDDR4X 4#@DESCRIPTION: Machine configuration for NXP i.MX 93 14x14 EVK with LPDDR4X
5#@MAINTAINER: Jun Zhu <junzhu@nxp.com> 5#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
6 6
7MACHINEOVERRIDES =. "mx93:"
8
9require conf/machine/include/imx93-evk.inc 7require conf/machine/include/imx93-evk.inc
10 8
11KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk" 9KERNEL_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 @@
4#@DESCRIPTION: Machine configuration for NXP i.MX93 9x9 QSB with LPDDR4 4#@DESCRIPTION: Machine configuration for NXP i.MX93 9x9 QSB with LPDDR4
5#@MAINTAINER: Jun Zhu <junzhu@nxp.com> 5#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
6 6
7MACHINEOVERRIDES =. "mx93:"
8
9require include/imx93-evk.inc 7require include/imx93-evk.inc
10 8
11KERNEL_DEVICETREE_BASENAME = "imx93-9x9-qsb" 9KERNEL_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 @@
1require conf/machine/include/imx-base.inc 1require conf/machine/include/imx-base.inc
2require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc 2require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
3 3
4MACHINEOVERRIDES =. "mx93:"
4MACHINE_FEATURES += "pci wifi bluetooth" 5MACHINE_FEATURES += "pci wifi bluetooth"
5MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio" 6MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio"
6 7