From 378e9ac39b306d0ee12d4ac86708d64c8ce8ddea Mon Sep 17 00:00:00 2001 From: Dalon Westergreen Date: Thu, 12 Nov 2015 00:18:37 -0800 Subject: Clean up KERNEL_DEVICETREE in machine conf and kernel recipes --- conf/machine/arria5.conf | 2 ++ conf/machine/cyclone5.conf | 2 ++ recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb | 2 -- recipes-kernel/linux/linux-altera-ltsi_3.10.bb | 2 -- recipes-kernel/linux/linux-altera_4.0.bb | 2 -- recipes-kernel/linux/linux-altera_4.1.bb | 2 -- recipes-kernel/linux/linux-altera_4.2.bb | 2 -- 7 files changed, 4 insertions(+), 10 deletions(-) diff --git a/conf/machine/arria5.conf b/conf/machine/arria5.conf index e94d3df..3105113 100644 --- a/conf/machine/arria5.conf +++ b/conf/machine/arria5.conf @@ -9,3 +9,5 @@ UBOOT_MACHINE = "socfpga_arria5" KMACHINE = "arria5" +KERNEL_DEVICETREE_linux-altera ?= "socfpga_arria5_socdk.dtb" +KERNEL_DEVICETREE_linux-altera-ltsi ?= "socfpga_arria5.dtb" diff --git a/conf/machine/cyclone5.conf b/conf/machine/cyclone5.conf index b993095..e6b9366 100644 --- a/conf/machine/cyclone5.conf +++ b/conf/machine/cyclone5.conf @@ -9,3 +9,5 @@ UBOOT_MACHINE = "socfpga_cyclone5" KMACHINE = "cyclone5" +KERNEL_DEVICETREE_linux-altera ?= "socfpga_cyclone5_socdk.dtb socfpga_cyclone5_sockit.dtb socfpga_cyclone5_socrates.dtb" +KERNEL_DEVICETREE_linux-altera-ltsi ?= "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 5d8db2c..6626393 100644 --- a/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb +++ b/recipes-kernel/linux/linux-altera-ltsi-rt_3.10.bb @@ -2,5 +2,3 @@ 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 fa3954d..523cd55 100644 --- a/recipes-kernel/linux/linux-altera-ltsi_3.10.bb +++ b/recipes-kernel/linux/linux-altera-ltsi_3.10.bb @@ -2,5 +2,3 @@ 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 925fc2f..e40a16c 100644 --- a/recipes-kernel/linux/linux-altera_4.0.bb +++ b/recipes-kernel/linux/linux-altera_4.0.bb @@ -1,5 +1,3 @@ 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 79485ec..60212b4 100644 --- a/recipes-kernel/linux/linux-altera_4.1.bb +++ b/recipes-kernel/linux/linux-altera_4.1.bb @@ -1,5 +1,3 @@ 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 f1432b2..556427b 100644 --- a/recipes-kernel/linux/linux-altera_4.2.bb +++ b/recipes-kernel/linux/linux-altera_4.2.bb @@ -1,5 +1,3 @@ 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" -- cgit v1.2.3-54-g00ecf