ls1043a/ls1046a: append non-upstream dtb on NXP bsp only

dtb with -sdk suffix only exist in kernel from NXP bsp. Append them
in machine configuration file only when using NXP bsp. Also, add the
dtb which already exist in pure mainline kernel.

This avoids failure when building pure mainline kernel.

Signed-off-by: Ting Liu <ting.liu@nxp.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 6357a439..e7c244aa 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -22,9 +22,12 @@ UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin"
 UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "\
-    freescale/fsl-ls1046a-rdb-sdk.dtb \
+    freescale/fsl-ls1046a-rdb.dtb \
     freescale/fsl-ls1046a-qds.dtb \
-    freescale/fsl-ls1046a-qds-sdk.dtb \
+"
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
+    freescale/fsl-ls1046a-rdb-sdk.dtb \
+    freescale/fsl-ls1046a-rdb-sdk.dtb \
 "
 KERNEL_DEFCONFIG ?= "defconfig"