recipes-kernel: Move DTB generation to meta-xilinx

oe-core changed the DTB generation to use the linux make system.
http://git.openembedded.org/openembedded-core/commit/?id=72980d5bb465f0640ed451d1ebb9c5d2a210ad0c
This resulted in the kernel make failing as the meta-xilinx contained
dts/dtsi files are not in the kernel tree.
To resolve, move the DTB creation using DTC into meta-xilinx layer.
This will correct the make error and build the DTS files in meta-xilinx.
Additionally the user can set KERNEL_DEVICETREE within local.conf to
build an in-kernel-tree DTS if they desire.

Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>

3 files changed, 68 insertions, 4 deletions

diff --git a/recipes-kernel/linux/linux-dtb.inc b/recipes-kernel/linux/linux-dtb.inc
new file mode 100644
index 00000000..afd47aef
--- /dev/null
+++ b/recipes-kernel/linux/linux-dtb.inc
@@ -0,0 +1,64 @@
+# Support for device tree generation
+OOT_KERNEL_DEVICETREE_FLAGS ?= "-R 8 -p 0x3000"
+
+python __anonymous () {
+    oot_devicetree = d.getVar("OOT_KERNEL_DEVICETREE", True) or ''
+    if oot_devicetree:
+        depends = d.getVar("DEPENDS", True)
+        d.setVar("DEPENDS", "%s dtc-native" % depends)
+}
+
+do_install_append() {
+        if test -n "${OOT_KERNEL_DEVICETREE}"; then
+                for DTS_FILE in ${OOT_KERNEL_DEVICETREE}; do
+                        if [ ! -f ${DTS_FILE} ]; then
+                                echo "Warning: ${DTS_FILE} is not available!"
+                                continue
+                        fi
+                        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+                        DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                        dtc -I dts -O dtb ${OOT_KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE}
+                        install -m 0644 ${DTS_BASE_NAME} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb
+                done
+        fi
+}
+
+do_deploy_append() {
+        if test -n "${OOT_KERNEL_DEVICETREE}"; then
+                for DTS_FILE in ${OOT_KERNEL_DEVICETREE}; do
+                        if [ ! -f ${DTS_FILE} ]; then
+                                echo "Warning: ${DTS_FILE} is not available!"
+                                continue
+                        fi
+                        DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+                        DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                        DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                        install -d ${DEPLOYDIR}
+                        install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb
+                        cd ${DEPLOYDIR}
+                        ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
+                        cd -
+                done
+        fi
+}
+
+pkg_postinst_kernel-devicetree () {
+        cd /${KERNEL_IMAGEDEST}
+        for DTS_FILE in ${OOT_KERNEL_DEVICETREE}
+        do
+                DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+                DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                update-alternatives --install /${KERNEL_IMAGEDEST}/${DTS_BASE_NAME}.dtb ${DTS_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
+        done
+}
+
+pkg_postrm_kernel-devicetree () {
+        cd /${KERNEL_IMAGEDEST}
+        for DTS_FILE in ${OOT_KERNEL_DEVICETREE}
+        do
+                DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+                DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"`
+                update-alternatives --remove ${DTS_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
+        done
+}
diff --git a/recipes-kernel/linux/linux-machine-common.inc b/recipes-kernel/linux/linux-machine-common.inc
index 2ef76ff9..8e31a0b9 100644
--- a/recipes-kernel/linux/linux-machine-common.inc
+++ b/recipes-kernel/linux/linux-machine-common.inc
@@ -1,4 +1,4 @@
-
+require linux-dtb.inc
 require linux-machine-config.inc
 
 # MicroBlaze is a uImage target, but its not called 'uImage'
diff --git a/recipes-kernel/linux/linux-machine-config.inc b/recipes-kernel/linux/linux-machine-config.inc
index 6568e4b5..f9af2abe 100644
--- a/recipes-kernel/linux/linux-machine-config.inc
+++ b/recipes-kernel/linux/linux-machine-config.inc
@@ -8,7 +8,7 @@
 #
 # This will expand out to:
 # SRC_URI_append += "file://zc702/zc702-zynq7.dts file://common/rtc.cfg"
-# KERNEL_DEVICETREE ?= "${WORKDIR}/devicetree/zc702-zynq7.dts"
+# OOT_KERNEL_DEVICETREE ?= "${WORKDIR}/devicetree/zc702-zynq7.dts"
 #
 # This include also adds all the 'conf/machine/boards' for all layers (that are
 # available) to the FILESEXTRAPATHS.
@@ -37,9 +37,9 @@ def get_additional_bbpath_filespath(path, d):
         return ":".join(board_extrapaths) + ":"
     return ""
 
-# If KERNEL_DEVICETREE is not set, default to the device tree's provided by
+# If OOT_KERNEL_DEVICETREE is not set, default to the device tree's provided by
 # MACHINE_DEVICETREE
-KERNEL_DEVICETREE ?= "${@get_all_devicetrees(d)}"
+OOT_KERNEL_DEVICETREE ?= "${@get_all_devicetrees(d)}"
 
 # Appends the '<layer>/conf/machine/boards' path to FILESEXTRAPATHS for all
 # layers (using the ${BBPATH})