The are use cases where the Device Tree appended to the kernel is
convinient, so we generate the bundle concatenating the kernel (and
potentionally the initramfs) and the Device Tree binaries.
To enable it, set KERNEL_DEVICETREE_BUNDLE variable to '1'
Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---
Changes in v8:
- rework append support to support ARM and MIPS (obi)
Changes in v7:
- simplified code
- rename bundle to use .bin extension
Changes in v6: None
Changes in v5:
- add support for initramfs bundle
Changes in v4:
- new patch
Changes in v3: None
Changes in v2: None
meta/classes/kernel-devicetree.bbclass | 62 +++++++++++++++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-devicetree.bbclass
b/meta/classes/kernel-devicetree.bbclass
index 8723f24212..c618594c96 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -1,6 +1,13 @@
# Support for device tree generation
-PACKAGES_append = " kernel-devicetree"
+PACKAGES_append = " \
+ kernel-devicetree \
+ ${@['kernel-image-zimage-bundle', ''][d.getVar('KERNEL_DEVICETREE_BUNDLE')
!= '1']} \
+"
FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb
/${KERNEL_IMAGEDEST}/*.dtbo"
+FILES_kernel-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin"
+
+# Generate kernel+devicetree bundle
+KERNEL_DEVICETREE_BUNDLE ?= "0"
normalize_dtb () {
DTB="$1"
@@ -20,6 +27,38 @@ get_real_dtb_path_in_kernel () {
echo "${DTB_PATH}"
}
+
+do_configure_devicetree() {
+ if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
+ if echo ${KERNEL_IMAGETYPE_FOR_MAKE} | grep -q 'zImage'; then
+ case "${ARCH}" in
+ "arm")
+ config="${B}/.config"
+ if ! grep -q 'CONFIG_ARM_APPENDED_DTB=y'
$config; then
+ bbwarn 'CONFIG_ARM_APPENDED_DTB is NOT
enabled in the kernel. Enabling it to allow the kernel to boot with the Device
Tree appended!'
+ sed -i "/CONFIG_ARM_APPENDED_DTB[ =]/d"
$config
+ echo "CONFIG_ARM_APPENDED_DTB=y" >>
$config
+ echo "# CONFIG_ARM_ATAG_DTB_COMPAT is
not set" >> $config
+ fi
+ ;;
+ "mips")
+ config="${B}/.config"
+ if ! grep -q 'CONFIG_MIPS_APPENDED_DTB=y'
$config; then
+ bbwarn 'CONFIG_MIPS_APPENDED_DTB is NOT
enabled in the kernel. Enabling it to allow the kernel to boot with the Device
Tree appended!'
+ sed -i "/CONFIG_MIPS_APPENDED_DTB[
=]/d" $config
+ echo "CONFIG_MIPS_APPENDED_DTB=y" >>
$config
+ fi
+ ;;
+ *)
+ bberror "KERNEL_DEVICETREE_BUNDLE is not
supported for ${ARCH}. Currently it is only supported for 'arm' and 'mips'."
+ esac
+ else
+ bberror 'The KERNEL_DEVICETREE_BUNDLE requires the
KERNEL_IMAGETYPE to contain zImage.'
+ fi
+ fi
+}
+addtask configure_devicetree after do_configure before do_compile
+
do_compile_devicetree() {
DTBS=""
for dtb in ${KERNEL_DEVICETREE}; do
@@ -43,6 +82,12 @@ fakeroot do_install_devicetree() {
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}
+
+ if [ "$type" = "zImage" ] && [
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
+ cat ${D}/${KERNEL_IMAGEDEST}/$type \
+
${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} \
+ >
${D}/${KERNEL_IMAGEDEST}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin
+ fi
done
done
}
@@ -63,6 +108,21 @@ do_deploy_append() {
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}
+
+ if [ "$type" = "zImage" ] && [
"${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
+ cat ${DEPLOYDIR}/$type \
+ ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT} \
+ >
${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}.bin
+ ln -sf ${DTB_NAME}.${DTB_EXT}.bin
${DEPLOYDIR}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin
+
+ if [ -e
"${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
+ cat
${KERNEL_OUTPUT_DIR}/${type}.initramfs \
+
${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT} \
+ >
${DEPLOYDIR}/${type}-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin
+ ln -sf
${type}-${INITRAMFS_BASE_NAME}-${DTB_BASE_NAME}.${DTB_EXT}.bin \
+
${DEPLOYDIR}/${type}-initramfs-${DTB_BASE_NAME}.${DTB_EXT}-${MACHINE}.bin
+ fi
+ fi
done
done
}
--
2.14.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
