diff --git a/classes-recipe/image_types_qcom.bbclass b/classes-recipe/image_types_qcom.bbclass index 962a0d036..407095aac 100644 --- a/classes-recipe/image_types_qcom.bbclass +++ b/classes-recipe/image_types_qcom.bbclass @@ -136,6 +136,11 @@ create_qcomflash_pkg() { install -m 0644 ${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR}/spinor/${QCOM_CDT_FILE}.bin spinor/cdt.bin fi + # dtb image + if [ -n "${QCOM_DTB_FILE}" ]; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/dtb-${QCOM_DTB_DEFAULT}-image.vfat spinor/${QCOM_DTB_FILE} + fi + # copy programer to support flash of HLOS images find "${DEPLOY_DIR_IMAGE}/${QCOM_BOOT_FILES_SUBDIR}/spinor" -maxdepth 1 -type f -name 'xbl_s_devprg_ns.melf' -exec install -m 0644 {} . \; fi diff --git a/recipes-bsp/partition/qcom-partition-conf_git.bb b/recipes-bsp/partition/qcom-partition-conf_git.bb index a338ce851..b7628ba9d 100644 --- a/recipes-bsp/partition/qcom-partition-conf_git.bb +++ b/recipes-bsp/partition/qcom-partition-conf_git.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b0a8acd90d872086b279ead88af03369" SRC_URI = "git://github.com/qualcomm-linux/qcom-ptool.git;branch=main;protocol=https" -SRCREV = "7520239e6eec6d04df29159f79e8e29e28fef0b5" +SRCREV = "6778b35b1db7fc8b0e94697dd504e027dabc677f" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes-kernel/images/esp-qcom-image.bb b/recipes-kernel/images/esp-qcom-image.bb index 492b932a3..9609668b2 100644 --- a/recipes-kernel/images/esp-qcom-image.bb +++ b/recipes-kernel/images/esp-qcom-image.bb @@ -19,7 +19,6 @@ UKI_CMDLINE += "${@d.getVar('KERNEL_CMDLINE_EXTRA') or ''}" KERNEL_DEVICETREE = "" KERNEL_DEVICETREE:sm8750-mtp = "${QCOM_DTB_DEFAULT}.dtb" KERNEL_DEVICETREE:kaanapali-mtp = "${QCOM_DTB_DEFAULT}.dtb" -KERNEL_DEVICETREE:iq-x7181-evk = "${QCOM_DTB_DEFAULT}.dtb" IMAGE_FSTYPES = "vfat" IMAGE_FSTYPES_DEBUGFS = ""