diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-12-29 09:49:15 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-29 09:49:15 -0300 |
commit | 9f57971d870bfad144aa8022bc4f1442d990b8b6 (patch) | |
tree | cd25a2d6cfed39c8933b1aaf76ea6d128ea9dcbd /conf | |
parent | c743e4b42757b73e4b349eefea11341bc34480fd (diff) | |
parent | d5d1cdfaa9dc82229f35334f9808a0f079de6397 (diff) | |
download | meta-freescale-9f57971d870bfad144aa8022bc4f1442d990b8b6.tar.gz |
Merge pull request #1714 from jmarcoscosta/imx9-rearrange-overrides
imx93: rearrange repeated overrides
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/imx93-11x11-lpddr4x-evk.conf | 2 | ||||
-rw-r--r-- | conf/machine/imx93-14x14-lpddr4x-evk.conf | 2 | ||||
-rw-r--r-- | conf/machine/imx93-9x9-lpddr4-qsb.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/imx93-evk.inc | 1 |
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 | ||
7 | MACHINEOVERRIDES =. "mx93:" | ||
8 | |||
9 | require include/imx93-evk.inc | 7 | require include/imx93-evk.inc |
10 | 8 | ||
11 | KERNEL_DEVICETREE_BASENAME = "imx93-11x11-evk" | 9 | 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 @@ | |||
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 | ||
7 | MACHINEOVERRIDES =. "mx93:" | ||
8 | |||
9 | require conf/machine/include/imx93-evk.inc | 7 | require conf/machine/include/imx93-evk.inc |
10 | 8 | ||
11 | KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk" | 9 | 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 @@ | |||
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 | ||
7 | MACHINEOVERRIDES =. "mx93:" | ||
8 | |||
9 | require include/imx93-evk.inc | 7 | require include/imx93-evk.inc |
10 | 8 | ||
11 | KERNEL_DEVICETREE_BASENAME = "imx93-9x9-qsb" | 9 | 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 @@ | |||
1 | require conf/machine/include/imx-base.inc | 1 | require conf/machine/include/imx-base.inc |
2 | require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc | 2 | require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc |
3 | 3 | ||
4 | MACHINEOVERRIDES =. "mx93:" | ||
4 | MACHINE_FEATURES += "pci wifi bluetooth" | 5 | MACHINE_FEATURES += "pci wifi bluetooth" |
5 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio" | 6 | MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse nxpiw612-sdio" |
6 | 7 | ||