From ed6bb7c14a97f0fc9189f7741ab5a7ec07633d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 24 Sep 2025 08:10:58 +0200 Subject: [PATCH 1/2] fix(debos/flash): Adapt to new ptool platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ptool introduced an extra level for platform partition files, allowing for eMMC and UFS options on some platforms. Adjust to the respective ones we are using and to having an extra level of directories. Signed-off-by: Loïc Minier --- debos-recipes/qualcomm-linux-debian-flash.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debos-recipes/qualcomm-linux-debian-flash.yaml b/debos-recipes/qualcomm-linux-debian-flash.yaml index 8935b1dd..1e88a72f 100644 --- a/debos-recipes/qualcomm-linux-debian-flash.yaml +++ b/debos-recipes/qualcomm-linux-debian-flash.yaml @@ -21,7 +21,7 @@ actions: {{- $boards = append $boards (dict "name" "qcs6490-rb3gen2-vision-kit" "silicon_family" "qcm6490" - "platform" "qcs6490-rb3gen2" + "platform" "qcs6490-rb3gen2/ufs" "boot_binaries_download" (dict "description" "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_00095.0/qcm6490-le-1-0/common/build/ufs/bin/QCM6490_bootbinaries.zip" @@ -44,7 +44,7 @@ actions: {{- $boards = append $boards (dict "name" "qcs8300-ride" "silicon_family" "qcs8300" - "platform" "qcs8300-ride-sx" + "platform" "qcs8300-ride-sx/ufs" "boot_binaries_download" (dict "description" "QCS8300 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_00095.0/qcs8300-le-1-0/common/build/ufs/bin/QCS8300_bootbinaries.zip" @@ -67,7 +67,7 @@ actions: {{- $boards = append $boards (dict "name" "qcs9100-ride-r3" "silicon_family" "qcs9100" - "platform" "qcs9100-ride-sx" + "platform" "qcs9100-ride-sx/ufs" "boot_binaries_download" (dict "description" "QCS9100 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_00095.0/qcs9100-le-1-0/common/build/ufs/bin/QCS9100_bootbinaries.zip" @@ -90,7 +90,7 @@ actions: {{- $boards = append $boards (dict "name" "qrb2210-rb1" "silicon_family" "qcm2290" - "platform" "qrb2210-rb1" + "platform" "qrb2210-rb1/emmc" "boot_binaries_download" (dict "description" "RB1 rescue image" "url" "https://releases.linaro.org/96boards/rb1/linaro/rescue/23.12/rb1-bootloader-emmc-linux-47528.zip" @@ -154,9 +154,9 @@ actions: rmdir -v build/{{ $board.name }}_boot-binaries/unpack/* build/{{ $board.name }}_boot-binaries/unpack # generate ptool files - various XML files for flashing, GPT data etc. - mkdir -v build/{{ $board.platform }}_ptool + mkdir -vp build/ptool/{{ $board.platform }} ( - cd build/{{ $board.platform }}_ptool + cd build/ptool/{{ $board.platform }} conf="${QCOM_PTOOL}/platforms/{{ $board.platform }}/partitions.conf" contents="${QCOM_PTOOL}/platforms/{{ $board.platform }}/contents.xml.in" disk_type="unknown" @@ -236,7 +236,7 @@ actions: rm -rf "${flash_dir}" mkdir -v "${flash_dir}" # copy platform partition files - cp --preserve=mode,timestamps -v build/{{ $board.platform }}_ptool/* \ + cp --preserve=mode,timestamps -v build/ptool/{{ $board.platform }}/* \ "${flash_dir}" # remove BLANK_GPT and WIPE_PARTITIONS files as it's common for people # to run "qdl rawprogram*.xml", mistakingly including these; perhaps From 4ff1c6f088c51955ee653eaa96d488f9de26babf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Wed, 24 Sep 2025 08:14:29 +0200 Subject: [PATCH 2/2] fix(debos/flash): Stop tracking latest ptool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The qcom-ptool can land breaking changes at any time, so stop tracking tip but instead point at specific SHAs. Signed-off-by: Loïc Minier --- debos-recipes/qualcomm-linux-debian-flash.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debos-recipes/qualcomm-linux-debian-flash.yaml b/debos-recipes/qualcomm-linux-debian-flash.yaml index 1e88a72f..ee69a3d5 100644 --- a/debos-recipes/qualcomm-linux-debian-flash.yaml +++ b/debos-recipes/qualcomm-linux-debian-flash.yaml @@ -11,7 +11,7 @@ architecture: arm64 actions: - action: download description: Download qcom-ptool - url: https://github.com/qualcomm-linux/qcom-ptool/archive/refs/heads/main.tar.gz + url: https://github.com/qualcomm-linux/qcom-ptool/archive/abf334c24cb24140a8b5c4cc99b633a119244639.tar.gz name: qcom-ptool filename: qcom-ptool.tar.gz unpack: true @@ -138,7 +138,7 @@ actions: mkdir -v build # path to unpacked qcom-ptool tarball - QCOM_PTOOL="${ROOTDIR}/../qcom-ptool.tar.gz.d/qcom-ptool-main" + QCOM_PTOOL="$(ls -d "${ROOTDIR}/../qcom-ptool.tar.gz.d/qcom-ptool-"*)" {{- range $board := $boards }} ### board: {{ $board.name }}