Move KERNEL_DEVICETREE back to linux recipes

9 files changed, 16 insertions, 12 deletions

diff --git a/conf/machine/arria10.conf b/conf/machine/arria10.conf
index 676752d..78f8159 100644
--- a/conf/machine/arria10.conf
+++ b/conf/machine/arria10.conf
@@ -9,5 +9,4 @@ UBOOT_MACHINE = "socfpga_arria10_defconfig"
 
 KMACHINE = "arria10"
 
-KERNEL_DEVICETREE_arria10 ?= "socfpga_arria10_socdk_sdmmc.dtb socfpga_arria10_socdk_qspi.dtb socfpga_arria10_swvp.dtb"
 
diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index 4ae2e9d..e94d3df 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -9,6 +9,3 @@ UBOOT_MACHINE = "socfpga_arria5"
 
 KMACHINE = "arria5"
 
-KERNEL_DEVICETREE ?= "socfpga_arria5_socdk.dtb"
-# For LTSI 3.10 kernel
-#KERNEL_DEVICETREE ?= "socfpga_arria5.dtb"
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 1a29e3c..b993095 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -9,6 +9,3 @@ UBOOT_MACHINE = "socfpga_cyclone5"
 
 KMACHINE = "cyclone5"
 
-KERNEL_DEVICETREE ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb"
-# For LTSI 3.10 kernel
-#KERNEL_DEVICETREE ?= "socfpga_cyclone5.dtb"
diff --git a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
index 6626393..6897a28 100644
--- a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
@@ -1,4 +1,7 @@
-include linux-altera.inc
 LINUX_VERSION = "3.10"
 LINUX_VERSION_SUFFIX = "-ltsi-rt"
 
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5.dtb"
+
+include linux-altera.inc
diff --git a/recipes-kernel/linux/linux-altera-ltsi_3.10.bb b/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
index 523cd55..33c7d4c 100644
--- a/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
@@ -1,4 +1,7 @@
-include linux-altera.inc
 LINUX_VERSION = "3.10"
 LINUX_VERSION_SUFFIX = "-ltsi"
 
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5.dtb"
+
+include linux-altera.inc
diff --git a/recipes-kernel/linux/linux-altera.inc b/recipes-kernel/linux/linux-altera.inc
index 3320c82..80ed9c5 100644
--- a/recipes-kernel/linux/linux-altera.inc
+++ b/recipes-kernel/linux/linux-altera.inc
@@ -24,5 +24,10 @@ 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"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"
+KERNEL_DEVICETREE_arria10 ?= "socfpga_arria10_socdk_sdmmc.dtb socfpga_arria10_socdk_qspi.dtb socfpga_arria10_swvp.dtb"
+
 require recipes-kernel/linux/linux-yocto.inc
 require linux-altera-configs.inc
diff --git a/recipes-kernel/linux/linux-altera_4.0.bb b/recipes-kernel/linux/linux-altera_4.0.bb
index e40a16c..c26248f 100644
--- a/recipes-kernel/linux/linux-altera_4.0.bb
+++ b/recipes-kernel/linux/linux-altera_4.0.bb
@@ -1,3 +1,3 @@
-include linux-altera.inc
 LINUX_VERSION = "4.0"
 
+include linux-altera.inc
diff --git a/recipes-kernel/linux/linux-altera_4.1.bb b/recipes-kernel/linux/linux-altera_4.1.bb
index 60212b4..4833c3e 100644
--- a/recipes-kernel/linux/linux-altera_4.1.bb
+++ b/recipes-kernel/linux/linux-altera_4.1.bb
@@ -1,3 +1,3 @@
-include linux-altera.inc
 LINUX_VERSION = "4.1"
 
+include linux-altera.inc
diff --git a/recipes-kernel/linux/linux-altera_4.2.bb b/recipes-kernel/linux/linux-altera_4.2.bb
index 556427b..482c219 100644
--- a/recipes-kernel/linux/linux-altera_4.2.bb
+++ b/recipes-kernel/linux/linux-altera_4.2.bb
@@ -1,3 +1,3 @@
-include linux-altera.inc
 LINUX_VERSION = "4.2"
 
+include linux-altera.inc