Skip to content

flash: support optional boot_bin_immutable_url in targets.json - #232

Merged
Bjordis Collaku (bjordiscollaku) merged 4 commits into
qualcomm-linux:mainfrom
phanendra-qc:dev/bootbins-immutable-split
Sep 23, 2026
Merged

flash: support optional boot_bin_immutable_url in targets.json#232
Bjordis Collaku (bjordiscollaku) merged 4 commits into
qualcomm-linux:mainfrom
phanendra-qc:dev/bootbins-immutable-split

Conversation

@phanendra-qc

@phanendra-qc Phanendra Yarra (phanendra-qc) commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Summary

PR qualcomm-linux/meta-qcom#3069 splits the boot binaries archive into a main zip and a companion immutable zip. The Yocto recipe deploys both into the same DEPLOYDIR; this PR mirrors that behaviour in the Ubuntu build pipeline.

Changes

flash/parse-boards-config.py

  • Add boot_bin_immutable_url as an optional field (defaults to "") in the schema doc comment and the setdefault normalization block.

flash/download-boot-bins.sh

  • Extract the download+extract logic into a reusable download_and_extract() helper (URL deduplication cache preserved).
  • After the main archive is placed in bins_<board>/, if boot_bin_immutable_url is set the immutable archive is downloaded (also deduplicated) and its contents are merged into the same bins_<board>/ directory via cp -a — exactly mirroring what the Yocto recipe does.
  • Targets without boot_bin_immutable_url are fully backward-compatible.

Dependency

Companion PR in qcom-distro-images: #138 — adds boot_bin_immutable_url and bumps versions in config/resolute/iot/targets.json.

@bjordiscollaku

Bjordis Collaku (bjordiscollaku) commented Sep 15, 2026

Copy link
Copy Markdown
Contributor

Reviewed the parser and download changes, and tested the flow locally with the real main and immutable archives for all four targets. The contents are merged correctly, shared URLs are downloaded only once, and targets without boot_bin_immutable_url continue to work as before. The implementation looks good to me. Please fix the DCO sign-off before merging.

@phanendra-qc

Phanendra Yarra (phanendra-qc) commented Sep 16, 2026

Copy link
Copy Markdown
Contributor Author

Reviewed the parser and download changes, and tested the flow locally with the real main and immutable archives for all four targets. The contents are merged correctly, shared URLs are downloaded only once, and targets without boot_bin_immutable_url continue to work as before. The implementation looks good to me. Please fix the DCO sign-off before merging.

Thanks for review, addressed DCO & also added cleanup of extact* folder post bin_ created

@shoudil

Shoudi Li (shoudil) commented Sep 21, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

workflow to validate: https://github.com/qualcomm-linux/qcom-distro-images/actions/runs/35578953740

@shoudil

Shoudi Li (shoudil) commented Sep 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Looks the programmer tools not present under nvme/ufs folder now https://qli-prod-artifacts.qualcomm.com/qli-prd-lecore-gh-artifacts/qualcomm-linux/qcom-distro-images/35578953740-1/

qcom-ubuntu-iot-resolute-server-canonical.images/iq-x7181-evk$ find . -name xbl_s_dev*
./spinor/xbl_s_devprg_ns.melf

@phanendra-qc

Phanendra Yarra (phanendra-qc) commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

With segregation bootbinaries , target team confirmed that not maintaining prog file per storage , this has to be added support newly to copy same deb prog across all storages

@phanendra-qc

Phanendra Yarra (phanendra-qc) commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

Vivek Magre (@vmagre) FYI of consumption of latest bootbinaries on hold due to H/P needs sereate handling.

kshiruri
kshiruri reviewed Sep 23, 2026
View reviewed changes
Comment thread flash/gen-flash-dirs.sh
kshiruri
kshiruri reviewed Sep 23, 2026
View reviewed changes
Comment thread flash/gen-flash-dirs.sh
@shoudil

Shoudi Li (shoudil) commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Could you rebase on main branch to remove this commit c7a872c ?

@phanendra-qc
flash: support optional boot_bin_immutable_url in targets.json
c6f5117 
PR qualcomm-linux/meta-qcom#3069 splits the boot binaries archive into
a main zip and a companion immutable zip. The Yocto recipe deploys both
into the same DEPLOYDIR; mirror that behaviour here.

Changes:
- parse-boards-config.py: add boot_bin_immutable_url as an optional
  field (defaults to "") in the schema doc and setdefault block
- download-boot-bins.sh: extract the download+extract logic into a
  reusable download_and_extract() helper (URL deduplication cache
  preserved). After the main archive is placed in bins_<board>/, if
  boot_bin_immutable_url is set the immutable archive is downloaded
  (also deduplicated) and its contents are merged into the same
  bins_<board>/ directory via cp -a.

Targets without boot_bin_immutable_url are fully backward-compatible.

Companion change: qualcomm-linux/qcom-distro-images dev/bootbins-immutable-split

Signed-off-by: Phanendra yarra <pyarra@qti.qualcomm.com>
@phanendra-qc
flash: remove _extract temp dirs after bins_<board>/ folders are created
7b9b97b 
The _extract_* and *_flat scratch directories used during archive
extraction were cached in URL_TO_EXTRACTED_DIR for deduplication but
never removed. Add a cleanup loop after all boards are processed to
rm -rf every cached temp dir, keeping the output directory tidy.

Signed-off-by: Phanendra yarra <pyarra@qti.qualcomm.com>
@phanendra-qc
flash/gen-flash-dirs: skip boot bin copy to nvme/ufs for spinor-only …
dc40b08 
…targets

For targets like iq-x7181-evk that have spinor storage, the flat boot
bins archive contains spinor-only firmware. The previous fallback logic
copied the entire flat archive root into every storage dir (nvme, ufs,
spinor), polluting nvme/ufs flash dirs with spinor-specific binaries.

Fix: when no storage-specific subdir exists in the archive and the
target has spinor, skip the flat-root fallback for non-spinor storage
types. nvme/ufs dirs now receive only ptool-generated partition files
and OS images (efi.bin, rootfs.img) as intended.

Targets without spinor (iq-8275-evk, iq-9075-evk, qcs6490-rb3gen2)
are unaffected — their HAS_SPINOR=false path still falls back to the
flat archive root.

Signed-off-by: Phanendra yarra <pyarra@qti.qualcomm.com>
@phanendra-qc
Update gen-flash-dirs.sh to copy programmer file to other storages
5ec0db9 
when STORAGE_SPINOR True
Update gen-flash-dirs.sh to copy programmer file to other storages

Signed-off-by: Phanendra Yarra <pyarra@qti.qualcomm.com>
@phanendra-qc

Phanendra Yarra (phanendra-qc) commented Sep 23, 2026

Copy link
Copy Markdown
Contributor Author

Could you rebase on main branch to remove this commit c7a872c ?

rebased

@bjordiscollaku
Bjordis Collaku (bjordiscollaku) merged commit 08747f3 into qualcomm-linux:main Sep 23, 2026
11 checks passed
@shoudil Shoudi Li (shoudil) mentioned this pull request Sep 24, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjordiscollaku Bjordis Collaku (bjordiscollaku) bjordiscollaku approved these changes
@vishwasudupa vishwas udupa (vishwasudupa) Awaiting requested review from vishwasudupa vishwasudupa is a code owner
@simonbeaudoin0935 Simon Beaudoin (simonbeaudoin0935) Awaiting requested review from simonbeaudoin0935 simonbeaudoin0935 is a code owner
@keerthi-go Keerthi Gowda (keerthi-go) Awaiting requested review from keerthi-go keerthi-go is a code owner
+1 more reviewer
@kshiruri kshiruri kshiruri left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@phanendra-qc @bjordiscollaku @shoudil @kshiruri