Check the existence of bl1 and fip from:
1. /opt/tf-a/${board_type}_${board_ident}, if not exist, then;
2. /opt/tf-a/${board_type}This change allows to test with TF-A with specified board ID only. Signed-off-by: Raymond Mao <[email protected]> --- Changes in v2: - Initial patch. .azure-pipelines.yml | 14 ++++++++++++-- .gitlab-ci.yml | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8209d2b329c..1382e4f6475 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -308,8 +308,18 @@ stages: /opt/coreboot/cbfstool \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f \${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; fi # If we have TF-A binaries, we need to use them. - if [[ -d /opt/tf-a/"\${TEST_PY_BD}" ]]; then - cp /opt/tf-a/"\${TEST_PY_BD}"/fip.bin /opt/tf-a/"\${TEST_PY_BD}"/bl1.bin /tmp; + tfa_dir="" + rm -f /tmp/fip.bin + rm -f /tmp/bl1.bin + if [[ -d /opt/tf-a/"\${TEST_PY_BD}\${TEST_PY_ID//--id /_}" ]]; then + tfa_dir="/opt/tf-a/\${TEST_PY_BD}\${TEST_PY_ID//--id /_}"; + elif [[ -d /opt/tf-a/"\${TEST_PY_BD}" ]]; then + tfa_dir="/opt/tf-a/\${TEST_PY_BD}"; + fi + if [[ -n "\$tfa_dir" ]]; then + cp "\$tfa_dir"/fip.bin "\$tfa_dir"/bl1.bin /tmp/; + fi + if [ -f /tmp/fip.bin ] && [ -f /tmp/bl1.bin ]; then export fip=/tmp/fip.bin; export bl1=/tmp/bl1.bin; export PATH=/opt/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3:\${PATH}; diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85401d3e09b..224485a2e64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,8 +97,18 @@ stages: /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; fi # If we have TF-A binaries, we need to use them. - - if [[ -d /opt/tf-a/"${TEST_PY_BD}" ]]; then - cp /opt/tf-a/"${TEST_PY_BD}"/fip.bin /opt/tf-a/"${TEST_PY_BD}"/bl1.bin /tmp/; + - tfa_dir="" + - rm -f /tmp/fip.bin + - rm -f /tmp/bl1.bin + - if [[ -d /opt/tf-a/"${TEST_PY_BD}${TEST_PY_ID//--id /_}" ]]; then + tfa_dir="/opt/tf-a/${TEST_PY_BD}${TEST_PY_ID//--id /_}"; + elif [[ -d /opt/tf-a/"${TEST_PY_BD}" ]]; then + tfa_dir="/opt/tf-a/${TEST_PY_BD}"; + fi + - if [[ -n "$tfa_dir" ]]; then + cp "$tfa_dir"/fip.bin "$tfa_dir"/bl1.bin /tmp/; + fi + - if [ -f /tmp/fip.bin ] && [ -f /tmp/bl1.bin ]; then export fip=/tmp/fip.bin; export bl1=/tmp/bl1.bin; export PATH=/opt/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3:${PATH}; -- 2.25.1
