Skip to content

Use qcom-ptool for RB1 #59

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

Merged
merged 4 commits into from
May 27, 2025
Merged

Use qcom-ptool for RB1 #59

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c58a215
debos: flash: Use build_rb1 in conditions
lool May 26, 2025
4ed6011
debos: flash: Add build_qcm6490 conditional
lool May 26, 2025
9f1288c
debos: flash: Use qcom-ptool for RB1
lool May 26, 2025
584beaa
debos: flash: Align copying logic between platforms
lool May 27, 2025
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
90 changes: 69 additions & 21 deletions debos-recipes/qualcomm-linux-debian-flash.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{{- $build_qcm6490 := or .build_qcm6490 "true" }}
{{- $build_rb1 := "false" -}}
{{- if .u_boot_rb1 -}}
{{- $build_rb1 := "true" }}
{{- $build_rb1 = "true" }}
{{- end -}}

architecture: arm64
Expand All @@ -13,7 +14,7 @@ actions:
filename: qcom-ptool.tar.gz
unpack: true

{{- if .u_boot_rb1 }}
{{- if eq $build_rb1 "true" }}
# TODO: consider switching to https://releases.linaro.org/96boards/rb1/qualcomm/firmware/RB1_firmware_20231124-v4.zip instead
- action: download
description: Download RB1 rescue image
Expand All @@ -22,17 +23,21 @@ actions:
filename: qrb2210-rb1_rescue-image.zip
{{- end }}

{{- if eq $build_qcm6490 "true" }}
- action: download
description: Download QCM6490 boot binaries
url: https://softwarecenter.qualcomm.com/download/software/chip/qualcomm_linux-spf-1-0/qualcomm-linux-spf-1-0_test_device_public/r1.0_00075.0/qcm6490-le-1-0/common/build/ufs/bin/QCM6490_bootbinaries.zip
name: qcm6490_boot-binaries
filename: qcm6490_boot-binaries.zip
{{- end }}

{{- if eq $build_qcm6490 "true" }}
- action: download
description: Download RB3 Gen2 Vision Kit CDT
url: https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-vision-kit.zip
name: rb3gen2-vision-kit_cdt
filename: rb3gen2-vision-kit_cdt.zip
{{- end }}

- action: run
description: Generate flash directories for eMMC and UFS boards
Expand All @@ -45,35 +50,75 @@ actions:
# path to unpacked qcom-ptool tarball
QCOM_PTOOL="${ROOTDIR}/../qcom-ptool.tar.gz.d/qcom-ptool-main"

{{- if .u_boot_rb1 }}
{{- if eq $build_rb1 "true" }}
### board: qrb2210-rb1
# unpack rescue image
unzip -j "${ROOTDIR}/../qrb2210-rb1_rescue-image.zip" \
-d build/qrb2210-rb1_rescue-image
# TODO: on RB1, we don't generate partition files with ptool since its
# partitions.conf does not have entries for data files from the rescue
# image, while the rescue image defines useful partitions such as the ESP
# generate partition files
mkdir -v build/qrb2210-rb1_partitions
(
cd build/qrb2210-rb1_partitions
conf="${QCOM_PTOOL}/platforms/qrb2210-rb1/partitions.conf"
"${QCOM_PTOOL}/gen_partition.py" -i "$conf" \
-o ptool-partitions.xml
# partitions.conf sets --type=emmc, nand or ufs
if grep -F '^--disk --type=ufs ' "${conf}"; then
touch flash-ufs
elif grep -F '^--disk --type=emmc ' "${conf}"; then
touch flash-emmc
fi
"${QCOM_PTOOL}/ptool.py" -x ptool-partitions.xml
)

flash_dir="${ARTIFACTDIR}/flash_rb1"
rm -rf "${flash_dir}"
mkdir -v "${flash_dir}"
# copy rescue image files
cp --preserve=mode,timestamps -v build/qrb2210-rb1_rescue-image/* \
# copy board partition files
cp --preserve=mode,timestamps -v build/qrb2210-rb1_partitions/* \
"${flash_dir}"
# copy RB1 U-Boot binary to u-boot-abootimg.img
# remove BLANK_GPT and WIPE_PARTITIONS files as it's common for people
# to run "qdl rawprogram*.xml", mistakingly including these; perhaps
# ptool should have a flag not to generate these; note that there are
# wipe_rawprogram*.xml files still
rm -v "${flash_dir}"/rawprogram*_BLANK_GPT.xml
rm -v "${flash_dir}"/rawprogram*_WIPE_PARTITIONS.xml
# copy board boot binaries; these shouldn't ship partition files, but
# make sure not to accidentally clobber any such file
find build/qrb2210-rb1_rescue-image \
-not -name 'gpt_*' \
-not -name 'patch*.xml' \
-not -name 'rawprogram*.xml' \
-not -name 'wipe*.xml' \
-not -name 'zeros_*' \
\( \
-name LICENSE \
-or -name Qualcomm-Technologies-Inc.-Proprietary \
-or -name 'prog_*' \
-or -name '*.bin' \
-or -name '*.elf' \
-or -name '*.fv' \
-or -name '*.mbn' \
\) \
-exec cp --preserve=mode,timestamps -v '{}' "${flash_dir}" \;
# copy RB1 U-Boot binary to boot.img;
# qcom-ptool/platforms/*/partitions.conf uses filename=boot.img
# boot_a and boot_b partitions
cp --preserve=mode,timestamps -v "${ARTIFACTDIR}/{{- .u_boot_rb1 -}}" \
"${flash_dir}/rb1-boot.img"
"${flash_dir}/boot.img"

# update flashing file for RB1 U-Boot; in the rescue image, this
# partition is blanked with boot-erase.img
sed -i '/label="boot_a"/s/filename="[^"]*"/filename="rb1-boot.img"/' "${flash_dir}"/rawprogram*.xml

# update flashing files for ESP image; in the rescue image, this
# partition is blanked with boot-erase.img
sed -i '/label="esp"/s#filename="[^"]*"#filename="../disk-sdcard.img1"#' "${flash_dir}"/rawprogram*.xml
# update flashing files for ESP image;
# qcom-ptool/platforms/*/partitions.conf uses filename=efi.bin for the
# ESP partition on EFI capable platforms
sed -i '/label="efi"/s#filename="[^"]*"#filename="../disk-sdcard.img1"#' \
"${flash_dir}"/rawprogram*.xml

# update flashing files for rootfs image;; in the rescue image, this
# partition is not provisioned
sed -i '/label="rootfs"/s#filename="[^"]*"#filename="../disk-sdcard.img2"#' "${flash_dir}"/rawprogram*.xml
# update flashing files for rootfs image;
# qcom-ptool/platforms/*/partitions.conf uses filename=rootfs.img for the
# rootfs partition
sed -i \
'/label="rootfs"/s#filename="[^"]*"#filename="../disk-sdcard.img2"#' \
"${flash_dir}"/rawprogram*.xml

# TODO: there is currently no dtb.bin alike system with the RB1 firmware

Expand All @@ -82,6 +127,7 @@ actions:
# rb1-bootloader-emmc-linux-47528.zip
{{- end }}

{{- if eq $build_qcm6490 "true" }}
## platform: QCM6490
# unpack boot binaries
unzip -j "${ROOTDIR}/../qcm6490_boot-binaries.zip" \
Expand Down Expand Up @@ -124,7 +170,8 @@ actions:
-not -name 'wipe*.xml' \
-not -name 'zeros_*' \
\( \
-name Qualcomm-Technologies-Inc.-Proprietary \
-name LICENSE \
Copy link
Collaborator

@ndechesne ndechesne May 26, 2025

Choose a reason for hiding this comment

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

this change does not seem related to this PR/commit

Copy link
Contributor Author

@lool lool May 26, 2025

Choose a reason for hiding this comment

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

Prior to this change, I was copying all files from the Linaro rescue image including the LICENSE; after this change, I'm only copying specific files with find, so I've added this other license name to the allowed list.

There are two identical bits of logic in that file now, for RB1 and QCM6490, as to allow merging them in the future; I took steps to pull them closer to each other as to eventually factor them – RB1 used to be super specific, but now there's hope to have common logic.

Copy link
Collaborator

@ndechesne ndechesne May 27, 2025

Choose a reason for hiding this comment

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

ok, i see. that still seems to be an example of a commit that does 2 things. That line here aligns the 6490 with 2210 after you removed the dependency on the linaro rescue image.

Copy link
Collaborator

@ndechesne ndechesne May 27, 2025

Choose a reason for hiding this comment

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

but this is getting a bit convoluted in here!

-or -name Qualcomm-Technologies-Inc.-Proprietary \
-or -name 'prog_*' \
-or -name '*.bin' \
-or -name '*.elf' \
Expand Down Expand Up @@ -178,6 +225,7 @@ actions:
sed -i \
'/label="rootfs"/s#filename="[^"]*"#filename="../disk-ufs.img2"#' \
"${flash_dir}"/rawprogram*.xml
{{- end }}

# cleanup
rm -rf build
Expand Down
Loading