Move KERNEL_DEVICETREE to linux recipes

7 files changed, 15 insertions, 15 deletions

diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf
index b92b84a..e94d3df 100644
--- a/conf/machine/arria5.conf
+++ b/conf/machine/arria5.conf
@@ -9,10 +9,3 @@ UBOOT_MACHINE = "socfpga_arria5"
 
 KMACHINE = "arria5"
 
-if [ "${KERNEL_PROVIDER}" == "linux-altera-ltsi" ]; then
-  KERNEL_DEVICETREE ?= "socfpga_arria5.dtb"
-elif [ "${KERNEL_PROVIDER}" == "linux-altera-ltsi-rt" ]; then
-  KERNEL_DEVICETREE ?= "socfpga_arria5.dtb"
-else
-  KERNEL_DEVICETREE ?= "socfpga_arria5_socdk.dtb"
-fi
diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf
index 0e9620a..b993095 100644
--- a/conf/machine/cyclone5.conf
+++ b/conf/machine/cyclone5.conf
@@ -9,11 +9,3 @@ UBOOT_MACHINE = "socfpga_cyclone5"
 
 KMACHINE = "cyclone5"
 
-if [ "${KERNEL_PROVIDER}" == "linux-altera-ltsi" ]; then
-  KERNEL_DEVICETREE ?= "socfpga_cyclone5.dtb"
-elif [ "${KERNEL_PROVIDER}" == "linux-altera-ltsi-rt" ]; then
-  KERNEL_DEVICETREE ?= "socfpga_cyclone5.dtb"
-else
-  KERNEL_DEVICETREE ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb"
-fi
-
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 379d0ec..5d8db2c 100644
--- a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb
@@ -1,3 +1,6 @@
 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"
diff --git a/recipes-kernel/linux/linux-altera-ltsi_3.10.bb b/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
index ad1bdc0..fa3954d 100644
--- a/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
+++ b/recipes-kernel/linux/linux-altera-ltsi_3.10.bb
@@ -1,3 +1,6 @@
 include linux-altera.inc
 LINUX_VERSION = "3.10"
 LINUX_VERSION_SUFFIX = "-ltsi"
+
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5.dtb"
diff --git a/recipes-kernel/linux/linux-altera_4.0.bb b/recipes-kernel/linux/linux-altera_4.0.bb
index d0a85ef..925fc2f 100644
--- a/recipes-kernel/linux/linux-altera_4.0.bb
+++ b/recipes-kernel/linux/linux-altera_4.0.bb
@@ -1,2 +1,5 @@
 include linux-altera.inc
 LINUX_VERSION = "4.0"
+
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"
diff --git a/recipes-kernel/linux/linux-altera_4.1.bb b/recipes-kernel/linux/linux-altera_4.1.bb
index 521e846..79485ec 100644
--- a/recipes-kernel/linux/linux-altera_4.1.bb
+++ b/recipes-kernel/linux/linux-altera_4.1.bb
@@ -1,2 +1,5 @@
 include linux-altera.inc
 LINUX_VERSION = "4.1"
+
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"
diff --git a/recipes-kernel/linux/linux-altera_4.2.bb b/recipes-kernel/linux/linux-altera_4.2.bb
index e23abac..f1432b2 100644
--- a/recipes-kernel/linux/linux-altera_4.2.bb
+++ b/recipes-kernel/linux/linux-altera_4.2.bb
@@ -1,2 +1,5 @@
 include linux-altera.inc
 LINUX_VERSION = "4.2"
+
+KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb"
+KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5_socdk.dtb"