From 68703bfbda08fc9aa3d53e3db4178e29827f44b4 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 18 Dec 2022 14:05:54 +0100 Subject: apalis-imx6: adjust KERNEL_DEVICETREE variable After change, the KERNEL_DEVICETREE contains the following DTBs: ``` imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb imx6q-apalis-ixora-v1.1.dtb imx6q-apalis-ixora-v1.2.dtb ``` Also remove "+=" usage, change to ":append" instead, since "+=" might not work if overrides being used somewhere. Related-to: ELB-4906 Signed-off-by: Ming Liu (cherry picked from commit b4835afb40cf5e2c8464163bd81964e043018e5f) --- conf/machine/include/apalis-imx6.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 46f8a56..1942e68 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -14,10 +14,8 @@ TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ " TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" -KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb" -KERNEL_DEVICETREE:use-mainline-bsp += " \ - imx6q-apalis-eval.dtb \ - imx6q-apalis-ixora-v1.1.dtb \ +KERNEL_DEVICETREE:append = " \ + imx6q-apalis-ixora-v1.2.dtb \ " PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" -- cgit v1.2.3