Skip to content

Commit 062201e

Browse files
authored
qcom-minimal-image: disable KERNEL_DEVICETREE when using multi-dtb (qualcomm-linux#176)
When QCOM_DTB_DEFAULT is set to multi-dtb, the DTB is expected to be provided by the firmware (supporting base dtbs and dtbos), but uki.bbclass still consumes KERNEL_DEVICETREE during image generation (enabled via IMAGE_CLASSES), causing an inclusion of all dtbs and dtbos set by the target machine, invalidating the DTB provided by the firmware during boot. Since uki.bbclass relies on KERNEL_DEVICETREE and it can't be modified without causing side effects at the kernel class and multi-dtb, an anonymous python snippet is added to the base qcom-distro image recipe, disabling it when using multi-dtb. This is a temporary workaround and should be removed once the upstream proposal [1] gets accepted by upstream. [1] https://lists.openembedded.org/g/openembedded-core/message/231436
2 parents 5aa0b12 + e891f42 commit 062201e

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

recipes-products/images/qcom-minimal-image.bb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@ TOOLCHAIN_TARGET_TASK += "kernel-devsrc"
2525
# Add RT tools only if the RT kernel is selected
2626
CORE_IMAGE_EXTRA_INSTALL += "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/kernel', \
2727
'linux-qcom-rt linux-qcom-next-rt', 'rt-tests', '', d)}"
28+
29+
# UKI workaround for targets using multi-dtb (dtb provided by the firmware)
30+
## To be removed once https://lists.openembedded.org/g/openembedded-core/message/231436 is accepted
31+
python __anonymous() {
32+
qcom_dtb_default = d.getVar("QCOM_DTB_DEFAULT")
33+
if qcom_dtb_default == "multi-dtb":
34+
d.setVar("KERNEL_DEVICETREE", "")
35+
}

0 commit comments

Comments
 (0)