diff options
| author | Arthur She <arthur.she@linaro.org> | 2024-04-23 15:23:46 -0700 |
|---|---|---|
| committer | Arthur She <arthur.she@linaro.org> | 2024-04-23 17:12:30 -0700 |
| commit | 46a2cf55737f12678ef3b327985e847e20d39532 (patch) | |
| tree | 1ec0829ae233e86785763b62295fab3e99f95699 | |
| parent | d9acd7d9b25690ec2c21bed115f20b98f3e3f0b8 (diff) | |
Pass fip.bin to LAVA by rep_binchange-27732
On top of patch 27732 [1], pass fip.bin through rep_bin.tar.bz2
[1]: https://review.trustedfirmware.org/c/ci/tf-a-ci-scripts/+/27732
Signed-off-by: Arthur She <arthur.she@linaro.org>
Change-Id: Ib432a0cfef40ca6a71ef3f6414f96896d2798004
| -rw-r--r-- | run_config/stm32mp1-sp_min.bl2 | 6 | ||||
| -rwxr-xr-x | script/gen_stm32mp1_test_yaml.sh | 4 | ||||
| -rw-r--r-- | script/lava-templates/stm32mp1-boot-test.yaml | 4 | ||||
| -rw-r--r-- | stm32mp1_utils.sh | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/run_config/stm32mp1-sp_min.bl2 b/run_config/stm32mp1-sp_min.bl2 index 662cff17..166bcb1d 100644 --- a/run_config/stm32mp1-sp_min.bl2 +++ b/run_config/stm32mp1-sp_min.bl2 @@ -14,7 +14,13 @@ post_tf_build() { } post_tf_archive() { + rep_bin="$workspace/rep_bin.tar.bz2" + payload_type="sp_min_bl2" gen_sp_min_bl2_sd_layout + + # pack tf-a-stm32mp157c-ev1.stm32 and fip.bin + tar -jcf $rep_bin -C $archive tf-a-stm32mp157c-ev1.stm32 fip.bin + archive_file "$rep_bin" } generate_lava_job() { diff --git a/script/gen_stm32mp1_test_yaml.sh b/script/gen_stm32mp1_test_yaml.sh index b9d4f597..c720134c 100755 --- a/script/gen_stm32mp1_test_yaml.sh +++ b/script/gen_stm32mp1_test_yaml.sh @@ -23,8 +23,7 @@ layout_file="FlashLayout_sdcard-stm32mp15x-eval.tsv" case "$payload_type" in sp_min_bl2) job_name="SP_min BL2" - rep_bin_file="tf-a-stm32mp157c-ev1.stm32" - fip_bin_file="fip.bin" + rep_bin_file="rep_bin.tar.bz2" ;; esac @@ -35,7 +34,6 @@ else fi rep_bin_url="$file_url/$rep_bin_file" -fip_bin_url="$file_url/$fip_bin_file" flash_layout_url="$file_url/$layout_file" expand_template "$(dirname "$0")/lava-templates/stm32mp1-boot-test.yaml" diff --git a/script/lava-templates/stm32mp1-boot-test.yaml b/script/lava-templates/stm32mp1-boot-test.yaml index 30075ca5..1520138e 100644 --- a/script/lava-templates/stm32mp1-boot-test.yaml +++ b/script/lava-templates/stm32mp1-boot-test.yaml @@ -21,8 +21,6 @@ actions: url: $flash_layout_url rep_bin: url: $rep_bin_url - fip_bin: - url: $fip_bin_url os: oe - boot: timeout: @@ -33,6 +31,6 @@ actions: minutes: 10 interactive: - name: int_1 - prompts: ["Hit any key to stop autoboot"] + prompts: ["buildroot login"] script: - command: diff --git a/stm32mp1_utils.sh b/stm32mp1_utils.sh index 80d8e50f..fe112c13 100644 --- a/stm32mp1_utils.sh +++ b/stm32mp1_utils.sh @@ -22,7 +22,7 @@ P 0x04 fsbl1 Binary mmc0 0x00004400 tf-a-stm32mp157c-ev1.stm32 P 0x05 fsbl2 Binary mmc0 0x00044400 tf-a-stm32mp157c-ev1.stm32 P 0x06 metadata1 Binary mmc0 0x00084400 metadata.bin P 0x07 metadata2 Binary mmc0 0x000C4400 metadata.bin -P 0x08 fip-a FIP mmc0 0x00104400 fip_bin/fip.bin +P 0x08 fip-a FIP mmc0 0x00104400 fip.bin PE 0x09 fip-b FIP mmc0 0x00504400 none PE 0x0A u-boot-env Binary mmc0 0x00904400 none P 0x10 bootfs System mmc0 0x00984400 bootfs.ext2 |