From 9ae80d10276c34b5d836df64bc364f87b82790d9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 26 Jan 2021 20:57:26 +0100 Subject: toradex-devicetree.bbclass: introduce bbclass file The major reason for doing this is because we are currently deploying all dtbo files to ${DEPLOY_DIR_IMAGE}/devicetree, but not machine specific ones, and they will be unnecessarily bundled into fitimage when kernel-fitimage.bbclass is being inherited. To fix that, we introduce a extra task do_collect_overlays to collect machine specific overlays to ${DT_FILES_PATH} before do_compile, where dtb compilation is being compiled in. In this way, only machine specific overlays would be compiled and deployed. Related-to: TOR-1700 Signed-off-by: Ming Liu (cherry picked from commit 3f3703403ce8451c997faee1eb1f7665bff24437) squashed with (cherry picked from commit 80534650f210472afbfd6f5d6d80559c708eb72e) (cherry picked from commit 6d8f8337ff1bf0200dead6adbc2615556b6495de) --- classes/image_type_tezi.bbclass | 40 ++--------------- classes/toradex-devicetree.bbclass | 88 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 37 deletions(-) create mode 100644 classes/toradex-devicetree.bbclass (limited to 'classes') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index e30201e..97328f1 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -5,8 +5,9 @@ # Since it also generates the image.json description file it is rather # interwind with the boot flow which is U-Boot target specific. -WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb " +WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb" DEPENDS += "${WKS_FILE_DEPENDS}" +IMAGE_BOOT_FILES_append = " overlays.txt overlays/*;overlays/ " RM_WORK_EXCLUDE += "${PN}" @@ -27,8 +28,6 @@ TEZI_BOOT_SUFFIX ??= "${@'bootfs.tar.xz' if oe.types.boolean('${TEZI_USE_BOOTFIL TEZI_CONFIG_FORMAT ??= "2" # Require newer Tezi for mx8 Socs with the u-boot environment bugfix TEZI_CONFIG_FORMAT_mx8 ??= "4" -TEZI_EXTERNAL_KERNEL_DEVICETREE ??= "" -TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT ??= "" TORADEX_FLASH_TYPE ??= "emmc" UBOOT_BINARY_TEZI_EMMC ?= "${UBOOT_BINARY}" UBOOT_BINARY_TEZI_RAWNAND ?= "${UBOOT_BINARY}" @@ -352,44 +351,11 @@ python tezi_deploy_bootfs_files() { tezi_deploy_bootfs_files[dirs] =+ "${WORKDIR}/bootfs" tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs" -MACHINE_PREFIX = "${MACHINE}" -MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x" -MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x" -MACHINE_PREFIX_colibri-imx7-emmc = "colibri-imx7" -tezi_deploy_dt_overlays() { - deploy_dt_dir=${DEPLOY_DIR_IMAGE}/devicetree/ - dtbos= - if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" -a -d "$deploy_dt_dir" ] ; then - machine_dtbos=`cd $deploy_dt_dir && ls ${MACHINE_PREFIX}[_-]*.dtbo 2>/dev/null || true` - common_dtbos=`cd $deploy_dt_dir && ls *.dtbo 2>/dev/null | grep -v -e 'imx[6-8]' -e 'tk1' | xargs || true` - dtbos="$machine_dtbos $common_dtbos" - else - dtbos="${TEZI_EXTERNAL_KERNEL_DEVICETREE}" - fi - - # overlays to copy to bootfs/overlays - mkdir -p ${WORKDIR}/bootfs/overlays/ - for dtbo in $dtbos; do - cp $deploy_dt_dir/$dtbo ${WORKDIR}/bootfs/overlays/ - done - - # overlays that we want to be applied during boot time - overlays= - for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT}; do - if [ ! -e ${WORKDIR}/bootfs/overlays/$dtbo ]; then - bbfatal "$dtbo is not installed in your boot filesystem, please make sure it's in TEZI_EXTERNAL_KERNEL_DEVICETREE or being provided by virtual/dtb." - fi - overlays="$overlays $dtbo" - done - - echo "fdt_overlays=$(echo $overlays)" > ${WORKDIR}/bootfs/overlays.txt -} - TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" IMAGE_CMD_bootfs () { : } -TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files tezi_deploy_dt_overlays" +TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files" do_image_bootfs[prefuncs] += "${TEZI_IMAGE_BOOTFS_PREFUNCS}" TEZI_IMAGE_TEZIIMG_PREFUNCS ??= "rootfs_tezi_run_json" diff --git a/classes/toradex-devicetree.bbclass b/classes/toradex-devicetree.bbclass new file mode 100644 index 0000000..4deb850 --- /dev/null +++ b/classes/toradex-devicetree.bbclass @@ -0,0 +1,88 @@ +# Toradex devicetree.bbclass extension +# +# This bbclass extends OE's devicetree.bbclass by implementing devicetree +# overlays compilation for Toradex BSPs. +# +# A overlays.txt file is generated in ${DEPLOY_DIR_IMAGE}, with a uboot +# environment variable 'fdt_overlays' containing the devicetree overlays +# to be applied to the boot devicetree at runtime. +# +# The following options are supported: +# +# TEZI_EXTERNAL_KERNEL_DEVICETREE = "a-overlay.dtbo another_overlay.dtbo" +# +# The devicetree overlays to be deployed +# to ${DEPLOY_DIR_IMAGE}/overlays, if not +# set, all common and machine related +# overlays would be deployed. +# +# TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "a-overlay.dtbo" +# +# The devicetree overlays to be applied at +# runtime, will be written to: +# ${DEPLOY_DIR_IMAGE}/overlays.txt, if not +# set, no overlays would be applied. +# +# Copyright 2021 (C) Toradex AG + +TEZI_EXTERNAL_KERNEL_DEVICETREE ??= "" +TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT ??= "" + +SUMMARY = "Toradex BSP device tree overlays" + +SRC_URI = "git://git.toradex.com/device-tree-overlays.git;branch=${SRCBRANCH};protocol=https" + +PV = "${SRCBRANCH}+git${SRCPV}" + +inherit devicetree + +S = "${WORKDIR}/git/overlays" +DT_FILES_PATH = "${WORKDIR}/machine-overlays" + +# The machine specific recipes start with MACHINE_PREFIX}[_-] +MACHINE_PREFIX = "${MACHINE}" +MACHINE_PREFIX_colibri-imx7-emmc = "colibri-imx7" +MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x" +MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x" + +do_collect_overlays () { + if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" ] ; then + machine_dts=`cd ${S} && ls ${MACHINE_PREFIX}[_-]*.dts 2>/dev/null || true` + common_dts=`cd ${S} && ls *.dts 2>/dev/null | grep -v -e 'imx[6-8]' -e 'tk1' | xargs || true` + all_dts="$machine_dts $common_dts" + else + for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE}; do + dtbo_ext=${dtbo##*.} + dts="`basename $dtbo .$dtbo_ext`.dts" + all_dts="$all_dts $dts" + done + fi + + for dts in $all_dts; do + cp ${S}/$dts ${DT_FILES_PATH} + done +} +do_collect_overlays[dirs] = "${DT_FILES_PATH}" +do_collect_overlays[cleandirs] = "${DT_FILES_PATH}" + +addtask collect_overlays after do_patch before do_configure + +do_deploy_append () { + install -d ${DEPLOYDIR}/overlays + if [ -d ${DEPLOYDIR}/devicetree ]; then + cp ${DEPLOYDIR}/devicetree/* ${DEPLOYDIR}/overlays + else + touch ${DEPLOYDIR}/overlays/none_deployed + fi + + # overlays that we want to be applied during boot time + overlays= + for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT}; do + if [ ! -e ${DEPLOYDIR}/overlays/$dtbo ]; then + bbfatal "$dtbo is not installed in your boot filesystem, please make sure it's in TEZI_EXTERNAL_KERNEL_DEVICETREE or being provided by virtual/dtb." + fi + overlays="$overlays $dtbo" + done + + echo "fdt_overlays=$(echo $overlays)" > ${DEPLOYDIR}/overlays.txt +} -- cgit v1.2.3