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>

diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index 7a7af2734e1e13dc00891d71738a1c779b1b83fa..c4329cda71e1af4bcde127cebe82a42f507f39ff 100644 (file)
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -22,7 +22,14 @@ UBOOT_CONFIG ??= "tfa-secure-boot tfa"
 UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
 UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
-KERNEL_DEVICETREE ?= "freescale/fsl-ls1043a-rdb-sdk.dtb freescale/fsl-ls1043a-qds.dtb freescale/fsl-ls1043a-qds-sdk.dtb"
+KERNEL_DEVICETREE ?= "\
+    freescale/fsl-ls1043a-rdb.dtb \
+    freescale/fsl-ls1043a-qds.dtb \
+"
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
+    freescale/fsl-ls1043a-rdb-sdk.dtb \
+    freescale/fsl-ls1043a-qds-sdk.dtb \
+"
 KERNEL_DEFCONFIG ?= "defconfig"
 
 UEFI_NORBOOT ?= "LS1043ARDB_EFI_NORBOOT.fd"

diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index 845b408956aaf540f858ae982ab867abf7f07f40..fedf9d4ce67ca91a045c8405454d5d7a5e2e6262 100644 (file)
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -22,6 +22,9 @@ UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig,,u-boot-dtb.bin"
 UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
 
 KERNEL_DEVICETREE ?= "\
+    freescale/fsl-ls1046a-frwy.dtb \
+"
+KERNEL_DEVICETREE_append_use-nxp-bsp = "\
     freescale/fsl-ls1046a-frwy-sdk.dtb \
 "
 KERNEL_DEFCONFIG ?= "defconfig"

diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 6357a43985d4762077594cdbd6167a285d4c85d3..e7c244aaad3108a1509f45c5da9fc771c3a3bfd8 100644 (file)
--- 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"