Redo RB1 flat image using purely the rescue

Signed-off-by: Loïc Minier <[email protected]>

Author: lool

debos-recipes/qualcomm-linux-debian-flash.yaml

@@ -50,46 +50,35 @@ actions:
       # unpack rescue image
       unzip -j "${ROOTDIR}/../qrb2210-rb1_rescue-image.zip" \
           -d build/qrb2210-rb1_rescue-image
-      # 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
-      )
+      # 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
       flash_dir="${ARTIFACTDIR}/flash_rb1"
       rm -rf "${flash_dir}"
       mkdir -v "${flash_dir}"
-      # copy partition files
-      cp --preserve=mode,timestamps -v build/qrb2210-rb1_partitions/* \
+      # copy rescue image files
+      cp --preserve=mode,timestamps -v build/qrb2210-rb1_rescue-image/* \
           "${flash_dir}"
-      # copy rescue binaries; skip partition files
-      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 '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 u-boot-abootimg.img
+      cp --preserve=mode,timestamps -v "{{- .u_boot_rb1 -}}" \
+          "${flash_dir}/u-boot-abootimg.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="u-boot-abootimg.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 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
+
+      # TODO: there is currently no dtb.bin alike system with the RB1 firmware
 
-      # TODO: currently not providing CDT; it's present in 96Boards'
-      # RB1_firmware_20231124-v4.zip but not in Linaro's
+      # TODO: currently not providing CDT; it's present in
+      # RB1_firmware_20231124-v4.zip but not in
       # rb1-bootloader-emmc-linux-47528.zip
 {{- end -}}