From cac084b6cdb2b2c459fa012b7b6a36f854dde184 Mon Sep 17 00:00:00 2001 From: Shoudi Li Date: Wed, 17 Jun 2026 18:40:30 +0800 Subject: [PATCH] Revert "[Backport Wrynose] Disable FIT and pack dtb in UKI as temp workaround to enable lava test on IQ-X7181 EVK" Revert the workaround as it caused regression issues: Boot up issue on catchall build as dtb merge not present in ostree-kernel-initramfs recipe. For the features with dependency on dtb overlays also get impacted, such as camera and kvm etc. Signed-off-by: Shoudi Li --- .github/workflows/test.yml | 4 ++-- conf/machine/iq-x7181-evk.conf | 2 -- recipes-kernel/images/esp-qcom-image.bb | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85f06a51d..f54284c6b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,7 +47,7 @@ jobs: secrets: inherit with: build_id: "${{ inputs.build_id }}" - devices: "glymur-crd,iq-8275-evk,iq-9075-evk,iq-x7181-evk,kaanapali-mtp,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" + devices: "glymur-crd,iq-8275-evk,iq-9075-evk,kaanapali-mtp,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" devices_premerge: "glymur-crd,iq-8275-evk,iq-9075-evk,kaanapali-mtp,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" project_name: "meta-qcom" distro_name: "qcom-distro" @@ -61,7 +61,7 @@ jobs: secrets: inherit with: build_id: "${{ inputs.build_id }}" - devices: "iq-8275-evk,iq-9075-evk,iq-x7181-evk,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" + devices: "iq-8275-evk,iq-9075-evk,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" devices_premerge: "iq-8275-evk,iq-9075-evk,qcm6490-idp,qcs615-ride,rb3gen2-core-kit,qcs8300-ride-sx,qcs9100-ride-sx,rb1-core-kit" project_name: "meta-qcom" distro_name: "qcom-distro" diff --git a/conf/machine/iq-x7181-evk.conf b/conf/machine/iq-x7181-evk.conf index f168527fe..bd02022a3 100644 --- a/conf/machine/iq-x7181-evk.conf +++ b/conf/machine/iq-x7181-evk.conf @@ -6,8 +6,6 @@ require conf/machine/include/qcom-hamoa.inc MACHINE_FEATURES += "efi pci" -QCOM_DTB_DEFAULT ?= "hamoa-iot-evk" - KERNEL_DEVICETREE ?= " \ qcom/hamoa-iot-evk.dtb \ qcom/hamoa-iot-evk-camera-imx577.dtbo \ diff --git a/recipes-kernel/images/esp-qcom-image.bb b/recipes-kernel/images/esp-qcom-image.bb index 7be74078a..f9c139ace 100644 --- a/recipes-kernel/images/esp-qcom-image.bb +++ b/recipes-kernel/images/esp-qcom-image.bb @@ -18,7 +18,6 @@ KERNEL_DEVICETREE = "" KERNEL_DEVICETREE:glymur-crd = "${QCOM_DTB_DEFAULT}.dtb" KERNEL_DEVICETREE:kaanapali-mtp = "${QCOM_DTB_DEFAULT}.dtb" KERNEL_DEVICETREE:sm8750-mtp = "${QCOM_DTB_DEFAULT}.dtb" -KERNEL_DEVICETREE:iq-x7181-evk = "${QCOM_DTB_DEFAULT}.dtb" setup_efi_folder() { # Move EFI content from packages expecting /boot to be the ESP location