From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 24 Apr 2020 07:48:09 +0000 (+0800)
Subject: ls1043a/ls1046a: append non-upstream dtb on NXP bsp only
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=41c93da5a;p=meta-freescale.git

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 7a7af273..c4329cda 100644
--- 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 845b4089..fedf9d4c 100644
--- 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 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"