@@ -33,10 +33,22 @@ actions:
3333 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
3434 name : qcm6490_boot-binaries
3535 filename : qcm6490_boot-binaries.zip
36+
3637 - action : run
3738 description : Verify download
3839 chroot : false
3940 command : echo 9c100d7b184ecf0ab9c4be71a8bb7c243fdc79a64380ca3025024dd2b14c5078 ${ROOTDIR}/../qcm6490_boot-binaries.zip|sha256sum --strict -c -
41+
42+ - action : download
43+ description : Download QCM6490 contents.xml
44+ 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/contents.xml
45+ name : qcm6490_contents-xml
46+ filename : qcm6490_contents.xml
47+
48+ - action : run
49+ description : Verify download
50+ chroot : false
51+ command : echo 42b384c0a82ffc294ffd690294b0261aadb2aa7bb6d85dd3eea522b50f90e7a3 ${ROOTDIR}/../qcm6490_contents.xml|sha256sum --strict -c -
4052{{- end }}
4153
4254{{- if eq $build_qcm6490 "true" }}
@@ -45,6 +57,7 @@ actions:
4557 url : https://artifacts.codelinaro.org/artifactory/codelinaro-le/Qualcomm_Linux/QCS6490/cdt/rb3gen2-vision-kit.zip
4658 name : qcs6490-rb3gen2-vision-kit_cdt
4759 filename : qcs6490-rb3gen2-vision-kit_cdt.zip
60+
4861 - action : run
4962 description : Verify download
5063 chroot : false
@@ -171,6 +184,8 @@ actions:
171184 # copy platform partition files
172185 cp --preserve=mode,timestamps -v build/qcs6490-rb3gen2_partitions/* \
173186 " ${flash_dir}"
187+ # copy platform contents.xml
188+ cp "${ROOTDIR}/../qcm6490_contents.xml" "${flash_dir}"/contents.xml
174189 # remove BLANK_GPT and WIPE_PARTITIONS files as it's common for people
175190 # to run "qdl rawprogram*.xml", mistakingly including these; perhaps
176191 # ptool should have a flag not to generate these; note that there are
@@ -234,13 +249,21 @@ actions:
234249 # ESP partition on EFI capable platforms
235250 sed -i '/label="efi"/s#filename="[^"]*"#filename="../disk-ufs.img1"#' \
236251 " ${flash_dir}" /rawprogram*.xml
252+ # contents.xml uses <file_name>efi.bin</file_name> for the ESP partition
253+ # on qcm6490
254+ sed -i '/<file_name>efi\.bin</s#>[^<]*<#>../disk-ufs.img1<#' \
255+ " ${flash_dir}" /contents.xml
237256
238257 # update flashing files for rootfs image;
239258 # qcom-ptool/platforms/*/partitions.conf uses filename=rootfs.img for the
240259 # rootfs partition
241260 sed -i \
242261 ' /label="rootfs"/s#filename="[^"]*"#filename="../disk-ufs.img2"#' \
243262 " ${flash_dir}" /rawprogram*.xml
263+ # contents.xml uses <file_name>system.img</file_name> for the rootfs
264+ # partition on qcm6490
265+ sed -i '/<file_name>system\.img</s#>[^<]*<#>../disk-ufs.img2<#' \
266+ " ${flash_dir}" /contents.xml
244267{{- end }}
245268
246269 # cleanup
0 commit comments