Rearranged location of board configuration files

* Moved qemu* device tree and kernel config to conf/machine/boards/qemu/
* Moved common dtsi and kernel config to conf/machine/boards/common/
* Added 'MACHINE_DEVICETREE' and 'MACHINE_KCONFIG' variables for linux-xlnx
  to allow machine configs to specify the exact device tree and config to
  use when building the kernel.

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

12 files changed, 124 insertions, 19 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 193230c0..ba976bad 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,3 +9,5 @@ BBFILE_COLLECTIONS += "xilinx"
 BBFILE_PATTERN_xilinx := "^${LAYERDIR}/"
 BBFILE_PRIORITY_xilinx = "8"
 
+XILINX_LAYERDIR := "${LAYERDIR}"
+XILINX_BOARDDIR := "${XILINX_LAYERDIR}/conf/machine/boards"
diff --git a/conf/machine/boards/common/nortc.cfg b/conf/machine/boards/common/nortc.cfg
new file mode 100644
index 00000000..b67c7a43
--- /dev/null
+++ b/conf/machine/boards/common/nortc.cfg
@@ -0,0 +1,78 @@
+# Disable the RTC
+
+# CONFIG_RTC_LIB is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_RTC_HCTOSYS is not set
+# CONFIG_RTC_HCTOSYS_DEVICE is not set
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+# CONFIG_RTC_INTF_SYSFS is not set
+# CONFIG_RTC_INTF_PROC is not set
+# CONFIG_RTC_INTF_DEV is not set
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_SNVS is not set
diff --git a/recipes-kernel/linux/linux-xlnx/xilinx_zynq_defconfig_3.6.cfg b/conf/machine/boards/common/xilinx_zynq_defconfig_3.6.cfg
index 9c11cdb1..9c11cdb1 100644
--- a/recipes-kernel/linux/linux-xlnx/xilinx_zynq_defconfig_3.6.cfg
+++ b/conf/machine/boards/common/xilinx_zynq_defconfig_3.6.cfg
diff --git a/recipes-kernel/linux/linux-xlnx/xilinx_zynq_defconfig_3.8.cfg b/conf/machine/boards/common/xilinx_zynq_defconfig_3.8.cfg
index 997532dc..997532dc 100644
--- a/recipes-kernel/linux/linux-xlnx/xilinx_zynq_defconfig_3.8.cfg
+++ b/conf/machine/boards/common/xilinx_zynq_defconfig_3.8.cfg
diff --git a/recipes-kernel/linux/linux-xlnx/zynq-7-base.dtsi b/conf/machine/boards/common/zynq-7-base.dtsi
index 7cac4da7..7cac4da7 100644
--- a/recipes-kernel/linux/linux-xlnx/zynq-7-base.dtsi
+++ b/conf/machine/boards/common/zynq-7-base.dtsi
diff --git a/recipes-kernel/linux/linux-xlnx/qemumicroblaze.cfg b/conf/machine/boards/qemu/qemumicroblaze.cfg
index e70c4a73..e70c4a73 100644
--- a/recipes-kernel/linux/linux-xlnx/qemumicroblaze.cfg
+++ b/conf/machine/boards/qemu/qemumicroblaze.cfg
diff --git a/recipes-kernel/linux/linux-xlnx/qemumicroblaze.dts b/conf/machine/boards/qemu/qemumicroblaze.dts
index 4a6e5a6c..4a6e5a6c 100644
--- a/recipes-kernel/linux/linux-xlnx/qemumicroblaze.dts
+++ b/conf/machine/boards/qemu/qemumicroblaze.dts
diff --git a/recipes-kernel/linux/linux-xlnx/qemuzynq.cfg b/conf/machine/boards/qemu/qemuzynq.cfg
index 1eadc199..1eadc199 100644
--- a/recipes-kernel/linux/linux-xlnx/qemuzynq.cfg
+++ b/conf/machine/boards/qemu/qemuzynq.cfg
diff --git a/recipes-kernel/linux/linux-xlnx/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts
index b66bcf81..b66bcf81 100644
--- a/recipes-kernel/linux/linux-xlnx/qemuzynq.dts
+++ b/conf/machine/boards/qemu/qemuzynq.dts
diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
index e84dd9ae..1b3a55a0 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/qemumicroblaze.conf
@@ -8,3 +8,6 @@ require conf/machine/include/tune-microblaze.inc
 TUNE_FEATURES_tune-microblaze += "v8.30 little-endian barrel-shift pattern-compare divide-hard multiply-high fpu-hard"
 
 SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/qemu/qemumicroblaze.dts"
+MACHINE_KCONFIG := "${XILINX_BOARDDIR}/qemu/qemumicroblaze.cfg"
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index dce1527d..56936a67 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -7,3 +7,6 @@ MACHINE_FEATURES := ""
 require conf/machine/include/tune-zynq.inc
 
 SERIAL_CONSOLE = "115200 ttyPS0"
+
+MACHINE_DEVICETREE := "${XILINX_BOARDDIR}/qemu/qemuzynq.dts"
+MACHINE_KCONFIG := "${XILINX_BOARDDIR}/qemu/qemuzynq.cfg"
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 12ca7cde..0b834b63 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -8,28 +8,47 @@ require recipes-kernel/linux/linux-yocto.inc
 # MicroBlaze is a uImage target, but its not called 'uImage'
 DEPENDS_append_microblaze += "u-boot-mkimage-native"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 SRC_URI = "git://github.com/Xilinx/linux-xlnx;protocol=git;nocheckout=1"
 
 PR = "r1"
-PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
-
-# Device Tree Sources
-SRC_URI_append_zynq += " \ 
-                file://zynq-7-base.dtsi \
-                "
-
-# QEMU MicroBlaze Machine Configurations
-SRC_URI_append_qemumicroblaze += " \
-                file://qemumicroblaze.cfg \
-                file://qemumicroblaze.dts \
-                "
-KERNEL_DEVICETREE_qemumicroblaze = "${WORKDIR}/qemumicroblaze.dts"
-SRC_URI_append_qemuzynq += " \
-                file://qemuzynq.cfg \
-                file://qemuzynq.dts \
-                "
-KERNEL_DEVICETREE_qemuzynq = "${WORKDIR}/qemuzynq.dts"
+PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCREV}"
+
+# Device Tree and Kernel Configuration
+
+# Common Device Tree Includes
+# (put them in ${WORKDIR} to avoid using dtc with include paths)
+FILESEXTRAPATHS_append := "${XILINX_LAYERDIR}/conf/machine/boards/common:"
+SRC_URI_append += "file://zynq-7-base.dtsi"
 
 # Override COMPATIBLE_MACHINE to include your machine in a bbappend file.
 COMPATIBLE_MACHINE = "qemumicroblaze|qemuzynq"
+
+# Scan all files in MACHINE_DEVICETREE and MACHINE_KCONFIG and populate SRC_URI,
+# FILESEXTRAPATHS and KERNEL_DEVICETREE.
+python __anonymous () {
+    workdir = d.getVar("WORKDIR", True)
+    machine_devicetree = d.getVar("MACHINE_DEVICETREE", True) or ''
+    machine_kconfigs = d.getVar("MACHINE_KCONFIG", True) or ''
+    extrapaths = set()
+    sources = set()
+    if machine_devicetree:
+        files=set()
+        for path in machine_devicetree.split():
+            sources.add("file://" + os.path.basename(path))
+            extrapaths.add(os.path.dirname(path))
+            if os.path.splitext(os.path.basename(path))[1] == '.dts':
+                files.add(os.path.join(workdir, os.path.basename(path)))
+        d.setVar("KERNEL_DEVICETREE", ' '.join(files))
+    if machine_kconfigs:
+        for path in machine_kconfigs.split():
+            files.add(os.path.join(workdir, os.path.basename(path)))
+            sources.add("file://" + os.path.basename(path))
+            extrapaths.add(os.path.dirname(path))
+
+    if len(extrapaths) != 0:
+        d.setVar("FILESEXTRAPATHS_append", ":".join(extrapaths) + ":")
+    if len(sources) != 0:
+        d.setVar("SRC_URI_append", " %s " % " ".join(sources))
+}