Remove devicetree appends from kernel recipes

The bulk of the devicetrees are already listed in the
machine configurations for the devices.  Having devicetree
lists in the machine confs and kernel recipes is confusing
and needless.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>

6 files changed, 12 insertions, 21 deletions

diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 4005b9d..1a49810 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -29,6 +29,10 @@ KERNEL_DEVICETREE ?= "\
                         socfpga_cyclone5_sockit.dtb \
                         socfpga_cyclone5_socrates.dtb \
                         socfpga_cyclone5_de0_sockit.dtb \
+                        socfpga_cyclone5_mcvevk.dtb \
+                        socfpga_cyclone5_sodia.dtb \
+                        socfpga_cyclone5_trcom.dtb \
+                        socfpga_cyclone5_vining_fpga.dtb \
                         "
 
 UBOOT_EXTLINUX ?= "1"
diff --git a/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb b/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb
index 0a4fc55..c61a7a7 100644
--- a/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi-rt_4.14-73.bb
@@ -7,6 +7,10 @@ include linux-altera.inc
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
 
+#DE0 dts name changed in later kernels
+KERNEL_DEVICETREE_remove_cyclone5 = "socfpga_cyclone5_de0_nano_soc.dtb"
+KERNEL_DEVICETREE_append_cyclone5 = "socfpga_cyclone5_de0_sockit.dtb"
+
 SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg "
 SRC_URI_append_arria5 = " file://config_lbdaf.cfg "
 SRC_URI_append_arria10 = " file://config_lbdaf.cfg "
diff --git a/recipes-kernel/linux/linux-altera-ltsi_4.14.73-ltsi.bb b/recipes-kernel/linux/linux-altera-ltsi_4.14.73-ltsi.bb
index eb66a4f..8fb3210 100644
--- a/recipes-kernel/linux/linux-altera-ltsi_4.14.73-ltsi.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi_4.14.73-ltsi.bb
@@ -5,10 +5,12 @@ SRCREV = "0d1cf8883fc9177ed74d576dbf18e32e49b2942d"
 
 include linux-altera.inc
 
-KERNEL_DEVICETREE_arria10_append ?= " socfpga_arria10_socdk_nand.dtb"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
 
+#DE0 dts name changed in later kernels
+KERNEL_DEVICETREE_remove_cyclone5 = "socfpga_cyclone5_de0_nano_soc.dtb"
+KERNEL_DEVICETREE_append_cyclone5 = "socfpga_cyclone5_de0_sockit.dtb"
+
 SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg "
 SRC_URI_append_arria5 = " file://config_lbdaf.cfg "
 SRC_URI_append_arria10 = " file://config_lbdaf.cfg "
diff --git a/recipes-kernel/linux/linux-altera.inc b/recipes-kernel/linux/linux-altera.inc
index 946a8bb..395437f 100644
--- a/recipes-kernel/linux/linux-altera.inc
+++ b/recipes-kernel/linux/linux-altera.inc
@@ -22,12 +22,5 @@ KBRANCH ?= "${LINUX_VERSION_PREFIX}${LINUX_VERSION}${LINUX_VERSION_SUFFIX}"
 
 SRC_URI = "${KERNEL_REPO};protocol=${KERNEL_PROT};branch=${KBRANCH}"
 
-# Default kernel devicetrees
-KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb socfpga_cyclone5_de0_nano_soc.dtb"
-KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"
-KERNEL_DEVICETREE_arria10 ?= "socfpga_arria10_socdk_sdmmc.dtb socfpga_arria10_socdk_qspi.dtb socfpga_arria10_swvp.dtb"
-KERNEL_DEVICETREE_stratix10swvp ?= "altera/stratix10_swvp.dtb"
-KERNEL_DEVICETREE_10m50 ?= "10m50_devboard.dtb"
-
 require recipes-kernel/linux/linux-yocto.inc
 require linux-altera-configs.inc
diff --git a/recipes-kernel/linux/linux-altera_4.20.bb b/recipes-kernel/linux/linux-altera_4.20.bb
index 4904d84..47043b0 100644
--- a/recipes-kernel/linux/linux-altera_4.20.bb
+++ b/recipes-kernel/linux/linux-altera_4.20.bb
@@ -6,12 +6,6 @@ include linux-altera.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-KERNEL_DEVICETREE_arria10_append ?= " socfpga_arria10_socdk_nand.dtb"
-KERNEL_DEVICETREE_cyclone5_append ?= " \
-        socfpga_cyclone5_mcvevk.dtb socfpga_cyclone5_sodia.dtb \
-        socfpga_cyclone5_trcom.dtb socfpga_cyclone5_vining_fpga.dtb \
-        "
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
 
 SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg "
diff --git a/recipes-kernel/linux/linux-altera_5.0.bb b/recipes-kernel/linux/linux-altera_5.0.bb
index d02a20a..6712f80 100644
--- a/recipes-kernel/linux/linux-altera_5.0.bb
+++ b/recipes-kernel/linux/linux-altera_5.0.bb
@@ -6,12 +6,6 @@ include linux-altera.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-KERNEL_DEVICETREE_arria10_append ?= " socfpga_arria10_socdk_nand.dtb"
-KERNEL_DEVICETREE_cyclone5_append ?= " \
-        socfpga_cyclone5_mcvevk.dtb socfpga_cyclone5_sodia.dtb \
-        socfpga_cyclone5_trcom.dtb socfpga_cyclone5_vining_fpga.dtb \
-        "
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/config:"
 
 SRC_URI_append_cyclone5 = " file://config_lbdaf.cfg "