From c440b18e0f6e93df4759e45e79f9f2b2cf67d6fe Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 23 Sep 2019 10:50:35 -0500 Subject: 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 (cherry picked from commit 9ba0cf3b74cf7884f9b1c1c44f92a96cb2a87525) --- conf/machine/imx7ulpevk.conf | 4 ++-- 1 file 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 @@ #@DESCRIPTION: Machine configuration for NXP i.MX7ULP EVK #@MAINTAINER: Lauren Post +MACHINEOVERRIDES =. "mx7:mx7ulp:" + require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += " pci wifi bluetooth qca9377" -MACHINEOVERRIDES =. "mx7:mx7ulp:" - KERNEL_DEVICETREE = "imx7ulp-evk.dtb imx7ulp-evk-emmc.dtb imx7ulp-evk-emmc-qspi.dtb imx7ulp-evk-ft5416.dtb imx7ulp-evk-mipi.dtb" KERNEL_DEVICETREE += "imx7ulp-evk-lpuart.dtb imx7ulp-evk-qspi.dtb imx7ulp-evk-sd1.dtb imx7ulp-evk-sensors-to-i2c5.dtb" KERNEL_DEVICETREE += "imx7ulp-evk-wm8960.dtb" -- cgit v1.2.3-54-g00ecf