Skip to content

Revert "[Backport Wrynose] Disable FIT and pack dtb in UKI as temp workaround to enable lava test on IQ-X7181 EVK" #2501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shoudi Li (shoudil) wants to merge 1 commit into
base: wrynose
Choose a base branch
from
Open

Revert "[Backport Wrynose] Disable FIT and pack dtb in UKI as temp workaround to enable lava test on IQ-X7181 EVK" #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

@lumag Dmitry Baryshkov (lumag) Jun 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions conf/machine/iq-x7181-evk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ require conf/machine/include/qcom-hamoa.inc

MACHINE_FEATURES += "efi pci"

QCOM_DTB_DEFAULT ?= "hamoa-iot-evk"

@lumag Dmitry Baryshkov (lumag) Jun 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? No, we can't do that until QDL / LAVA setup is fixed to reflash SPI NOR

@shoudil Shoudi Li (shoudil) Jun 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is bootup regression issue on recent nightly catchall build (boot well on non-catchall). So suspect the FIT disable workaround merged initially. I will close this draft PR and create an issue to track.

@shoudil Shoudi Li (shoudil) Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Locally verified with this PR (revert #2451), able to bootup on catchall build. Dmitry Baryshkov (@lumag) any concern to pick this PR for release ?

@lumag Dmitry Baryshkov (lumag) Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read the comment that you are replying to.

@shoudil Shoudi Li (shoudil) Jun 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be some issue in DTB merge or deployment with ostree enabled. looks only the last dtb in KERNEL_DEVICETREE get packed in uki.

https://github.com/qualcomm-linux/meta-qcom/blob/master/conf/machine/iq-x7181-evk.conf#L11

On Catchall build:

$ ukify inspect uki.efi
.osrel:
size: 294 bytes
sha256: 2fb049e86555f9921b41679d3f56769cf58afa20a901331ed97efbc4b5646243
text:
ID=qcom-distro-catchall
NAME="Qualcomm Linux Reference Distro (SELinux-enabled) (OTA-enabled)"
VERSION="2.0"
VERSION_ID=2.0
PRETTY_NAME="Qualcomm Linux Reference Distro (SELinux-enabled) (OTA-enabled) 2.0"
CPE_NAME="cpe:/o:openembedded:qcom-distro-catchall:2.0"
BUILD_ID="local-20260619061508"
.dtb:
size: 2433 bytes
sha256: 33ba2ee368993b340d43633e5134c6d415d83c25c4e6209cf1d6bef184d5c237

$ sha256sum hamoa-iot-evk-camera-imx577.dtbo
33ba2ee368993b340d43633e5134c6d415d83c25c4e6209cf1d6bef184d5c237 hamoa-iot-evk-camera-imx577.dtbo
$ sha256sum hamoa-iot-evk.dtb
e85ee51557bff95a3df0a2ab4b747312bbe7b4a8abea3a196d77465db8c18818 hamoa-iot-evk.dtb

@lumag Dmitry Baryshkov (lumag) Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again. We must be using UKI with the embedded DTB until the CI is fixed.

@shoudil Shoudi Li (shoudil) Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get it, let me discuss with team how to move forward release with this temp workaround.

@quic-tingweiz Tingwei Zhang (quic-tingweiz) Jun 24, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using UKI with embedded DTB has caused regression issues on Hamoa.

  1. catchall build boot up issue as describe in commit message.
  2. Upstream camera function is totally broken due to camera dtbo is not included in embedded DTB.
    In the meantime, it blocks below functions to be enabled. These two functions are important features that we planned to enable by end of June.
  3. CameraX which requires camerax dtbo.
  4. KVM which requires el2 dtbo.
    When will SPINOR flash issue be fixed in lava so we can use dtb partition on SPINOR in CI? This is a major blocker for all above issues.

@lumag Dmitry Baryshkov (lumag) Jun 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the upstream camera, use the dtb with the .dtbo applied. No, this can't be merged before LAVA is upgraded. Please stop pinging here and there, the answer will be the same.

@shoudil Shoudi Li (shoudil) Jun 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still issue there for camx and KVM enablement.


KERNEL_DEVICETREE ?= " \
qcom/hamoa-iot-evk.dtb \
qcom/hamoa-iot-evk-camera-imx577.dtbo \
Expand Down
1 change: 0 additions & 1 deletion recipes-kernel/images/esp-qcom-image.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading