From 708d7ea4f7cfc677eaef7c94d0765a228a3cbc0f Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 22 Dec 2020 15:21:23 -0600 Subject: imx7ulpevk: Split kernel device trees properly Specify mainline versus NXP kernel device trees. Signed-off-by: Tom Hochstein --- conf/machine/imx7ulpevk.conf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index d3b816b5..7bb70012 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -12,6 +12,14 @@ require conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += "pci wifi bluetooth bcm43430" KERNEL_DEVICETREE = " \ + imx7ulp-evk.dtb \ +" +KERNEL_DEVICETREE_append_use-mainline-bsp = " \ + imx7ulp-com.dtb \ +" +KERNEL_DEVICETREE_append_use-nxp-bsp = " \ + imx7ulp-evk-ft5416.dtb \ + imx7ulp-evk-mipi.dtb \ imx7ulp-evkb.dtb \ imx7ulp-evkb-emmc.dtb \ imx7ulp-evkb-lpuart.dtb \ @@ -21,9 +29,6 @@ KERNEL_DEVICETREE = " \ imx7ulp-evkb-sd1.dtb \ imx7ulp-evkb-sensors-to-i2c5.dtb \ imx7ulp-evkb-spi-slave.dtb \ - imx7ulp-evk.dtb \ - imx7ulp-evk-ft5416.dtb \ - imx7ulp-evk-mipi.dtb \ " UBOOT_CONFIG ??= " \ -- cgit v1.2.3-54-g00ecf