[meta-xilinx] [PATCH 1/5] conf/machine/*: Allow per machine DTS selection

[Manjukumar Matha]

This commit does not change the functionality in any way. This moves the
device tree setup out of the common include, allowing individual
machines to switch over to the kernel device tree in subsequent patches
of the series.

Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 conf/machine/include/machine-xilinx-default.inc | 9 ---------
 conf/machine/microzed-zynq7.conf                | 2 ++
 conf/machine/picozed-zynq7.conf                 | 2 ++
 conf/machine/qemuzynq.conf                      | 3 ++-
 conf/machine/zc702-zynq7.conf                   | 2 ++
 conf/machine/zc706-zynq7.conf                   | 3 ++-
 conf/machine/zedboard-zynq7.conf                | 2 ++
 conf/machine/zybo-zynq7.conf                    | 2 ++
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 8a23f07..28ddc0d 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -26,12 +26,3 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_ELF ?= "u-boot"
 UBOOT_ELF_aarch64 ?= "u-boot.elf"
-
-# By default use the device-tree recipe to generate device trees for Zynq machines
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree"
-
-# Common Device Tree Includes
-MACHINE_DEVICETREE_append_zynq += " \
-		common/zynq7-base.dtsi \
-		"
-
diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index 374e710..5342d6e 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -13,9 +13,11 @@ UBOOT_MACHINE = "zynq_microzed_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		microzed/microzed-zynq7-board.dtsi \
 		microzed/microzed-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
index 63466ae..d7f44b9 100644
--- a/conf/machine/picozed-zynq7.conf
+++ b/conf/machine/picozed-zynq7.conf
@@ -17,9 +17,11 @@ UBOOT_MACHINE = "zynq_picozed_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		picozed/picozed-zynq7-board.dtsi \
 		picozed/picozed-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index 1391439..90282ea 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -11,11 +11,12 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		qemu/qemuzynq.dts \
 		qemu/qemuzynq-base.dtsi \
+		common/zynq7-base.dtsi \
 		"
 
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
-
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 096d9d1..b7b4923 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -20,9 +20,11 @@ UBOOT_MACHINE = "zynq_zc70x_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		zc702/zc702-zynq7-board.dtsi \
 		zc702/zc702-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 KERNEL_FEATURES += "features/rtc/rtc.scc"
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 8bc0483..99a2969 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -20,12 +20,13 @@ UBOOT_MACHINE = "zynq_zc70x_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		zc706/zc706-zynq7-board.dtsi \
 		zc706/zc706-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 KERNEL_FEATURES += "features/rtc/rtc.scc"
 
 EXTRA_IMAGEDEPENDS += "virtual/boot-bin"
-
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 00a93ca..a88f3de 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -17,9 +17,11 @@ UBOOT_MACHINE = "zynq_zed_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		zedboard/zedboard-zynq7-board.dtsi \
 		zedboard/zedboard-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${MACHINE}.dtb"
diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
index b1be2a0..821119e 100644
--- a/conf/machine/zybo-zynq7.conf
+++ b/conf/machine/zybo-zynq7.conf
@@ -16,9 +16,11 @@ UBOOT_MACHINE = "zynq_zybo_config"
 
 SERIAL_CONSOLE = "115200 ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 MACHINE_DEVICETREE := " \
 		zybo/zybo-zynq7-board.dtsi \
 		zybo/zybo-zynq7.dts \
+		common/zynq7-base.dtsi \
 		"
 
 IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
-- 
2.1.4