diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2019-09-23 10:50:35 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-10-10 09:14:41 -0300 |
commit | c440b18e0f6e93df4759e45e79f9f2b2cf67d6fe (patch) | |
tree | 20e20e39aa111e42b46c2cd4c7a9a2d4fe977d84 | |
parent | 2142f7ded1b3115ccc21f7575fd83e2376247193 (diff) | |
download | meta-freescale-c440b18e0f6e93df4759e45e79f9f2b2cf67d6fe.tar.gz |
imx7ulpevk.conf: Fix MACHINEOVERRIDES order
The exact manifestation that uncovered this problem was not recorded.
Generally speaking, a recipe misconfiguration was occurring due to an
incorrect variable value, caused by incorrectly choosing the _imx
override of the variable instead of the SOC override.
This is fixed by setting the SOC family and the SOC in MACHINEOVERRIDES
before including tune-cortexa7.inc.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 9ba0cf3b74cf7884f9b1c1c44f92a96cb2a87525)
-rw-r--r-- | conf/machine/imx7ulpevk.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index 69adb3da..e493a571 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf | |||
@@ -4,13 +4,13 @@ | |||
4 | #@DESCRIPTION: Machine configuration for NXP i.MX7ULP EVK | 4 | #@DESCRIPTION: Machine configuration for NXP i.MX7ULP EVK |
5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> | 5 | #@MAINTAINER: Lauren Post <Lauren.Post@nxp.com> |
6 | 6 | ||
7 | MACHINEOVERRIDES =. "mx7:mx7ulp:" | ||
8 | |||
7 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
8 | require conf/machine/include/tune-cortexa7.inc | 10 | require conf/machine/include/tune-cortexa7.inc |
9 | 11 | ||
10 | MACHINE_FEATURES += " pci wifi bluetooth qca9377" | 12 | MACHINE_FEATURES += " pci wifi bluetooth qca9377" |
11 | 13 | ||
12 | MACHINEOVERRIDES =. "mx7:mx7ulp:" | ||
13 | |||
14 | KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evk-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb" | 14 | KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evk-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb" |
15 | KERNEL_DEVICETREE += "imx7ulp-evk-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evk-sd1.dtb imx7ulp-evk-sensors-to-i2c5.dtb" | 15 | KERNEL_DEVICETREE += "imx7ulp-evk-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evk-sd1.dtb imx7ulp-evk-sensors-to-i2c5.dtb" |
16 | KERNEL_DEVICETREE += "imx7ulp-evk-wm8960.dtb" | 16 | KERNEL_DEVICETREE += "imx7ulp-evk-wm8960.dtb" |