kernel: Move Device Tree support to kernel.bbclass

The Device Tree is commonly used but it is still kept as a .inc file
instead of a proper class. Instead now we move the Device Tree code to
a kernel-devicetree class and automatically enable it when the
KERNEL_DEVICETREE variable is set.

To avoid breakage in existing layers, we kept a linux-dtb.inc file
which raises a warning telling the user about the change so in next
release this can be removed.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
new file mode 100644 (file)
index 0000000..72814ca
--- /dev/null
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -0,0 +1,62 @@
+# Support for device tree generation
+PACKAGES_append = " kernel-devicetree"
+FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo"
+
+normalize_dtb () {
+       DTB="$1"
+       if echo ${DTB} | grep -q '/dts/'; then
+               bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
+               DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
+       fi
+       echo "${DTB}"
+}
+
+get_real_dtb_path_in_kernel () {
+       DTB="$1"
+       DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}"
+       if [ ! -e "${DTB_PATH}" ]; then
+               DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}"
+       fi
+       echo "${DTB_PATH}"
+}
+
+do_compile_append() {
+       for DTB in ${KERNEL_DEVICETREE}; do
+               DTB=`normalize_dtb "${DTB}"`
+               oe_runmake ${DTB}
+       done
+}
+
+do_install_append() {
+       for DTB in ${KERNEL_DEVICETREE}; do
+               DTB=`normalize_dtb "${DTB}"`
+               DTB_EXT=${DTB##*.}
+               DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
+               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+               install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT}
+               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
+                       symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
+                       DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+                       ln -sf ${DTB_BASE_NAME}.${DTB_EXT} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT}
+               done
+       done
+}
+
+do_deploy_append() {
+       for DTB in ${KERNEL_DEVICETREE}; do
+               DTB=`normalize_dtb "${DTB}"`
+               DTB_EXT=${DTB##*.}
+               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
+                       base_name=${type}"-"${KERNEL_IMAGE_BASE_NAME}
+                       symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
+                       DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+                       DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
+                       DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
+                       install -d ${DEPLOYDIR}
+                       install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}
+                       ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.${DTB_EXT}
+                       ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_BASE_NAME}.${DTB_EXT}
+               done
+       done
+}

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 02a5e961cb86c04e7f84e61c0f369bcd26f4bb78..0ad522d1671c529d046fac49bb6bb963f2a6064f 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -662,3 +662,6 @@ do_deploy[prefuncs] += "package_get_auto_pr"
 addtask deploy after do_populate_sysroot do_packagedata
 
 EXPORT_FUNCTIONS do_deploy
+
+# Add using Device Tree support
+inherit kernel-devicetree

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index ca92822d25016e58eb3b119d7bbcc6d79a85af06..f1912775cade254d4fd388328749729ca1a3487d 100644 (file)
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -1,65 +1,3 @@
-# Support for device tree generation
-FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo"
-
-python __anonymous () {
-    d.appendVar("PACKAGES", " kernel-devicetree")
-}
-
-normalize_dtb () {
-       DTB="$1"
-       if echo ${DTB} | grep -q '/dts/'; then
-               bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
-               DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
-       fi
-       echo "${DTB}"
-}
-
-get_real_dtb_path_in_kernel () {
-       DTB="$1"
-       DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}"
-       if [ ! -e "${DTB_PATH}" ]; then
-               DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}"
-       fi
-       echo "${DTB_PATH}"
-}
-
-do_compile_append() {
-       for DTB in ${KERNEL_DEVICETREE}; do
-               DTB=`normalize_dtb "${DTB}"`
-               oe_runmake ${DTB}
-       done
-}
-
-do_install_append() {
-       for DTB in ${KERNEL_DEVICETREE}; do
-               DTB=`normalize_dtb "${DTB}"`
-               DTB_EXT=${DTB##*.}
-               DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
-               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-               install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT}
-               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
-                       symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
-                       DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                       ln -sf ${DTB_BASE_NAME}.${DTB_EXT} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT}
-               done
-       done
-}
-
-do_deploy_append() {
-       for DTB in ${KERNEL_DEVICETREE}; do
-               DTB=`normalize_dtb "${DTB}"`
-               DTB_EXT=${DTB##*.}
-               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-               for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
-                       base_name=${type}"-"${KERNEL_IMAGE_BASE_NAME}
-                       symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
-                       DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                       DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                       DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
-                       install -d ${DEPLOYDIR}
-                       install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}
-                       ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.${DTB_EXT}
-                       ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_BASE_NAME}.${DTB_EXT}
-               done
-       done
+python() {
+    bb.warn("You are using the linux-dtb.inc which is deprecated. You can safely remove it as the Device Tree support is automatically enabled when KERNEL_DEVICETREE is set.")
 }

diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 1b8ffd0c17ef5278ae79302c16cab1b61aaaa58c..9c1f61be75d47fd14f836bffd95aed2e58d7ac9f 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -54,7 +54,6 @@ LINUX_VERSION_EXTENSION ??= "-yocto-${LINUX_KERNEL_TYPE}"
 # Pick up shared functions
 inherit kernel
 inherit kernel-yocto
-require linux-dtb.inc
 
 B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"