diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2015-06-15 12:20:51 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2015-06-15 12:20:51 +0100 |
| commit | 3ef55b50d2b24df94579feb76afea912d221c612 (patch) | |
| tree | 4ddd8e9050ac2d7a384e977e1dfd5b58e003941b | |
| parent | a7d4ed1013d458e2f89e99309a3faa7056e8f61f (diff) | |
Don't use sub-dirs because CI doesn't cope with it very well.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | fvp-pre-boot.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fvp-pre-boot.sh b/fvp-pre-boot.sh index 0059787..52dd5cc 100755 --- a/fvp-pre-boot.sh +++ b/fvp-pre-boot.sh @@ -194,8 +194,8 @@ else fvp) ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${TARGET} fvp_minimal count_errors $? - export BL33=`pwd`/`find . -name FVP_AARCH64_EFI.fd` - cp -a ${BL33} ${builddir}/uefi_fvp-base.bin + export BL33=${builddir}/uefi_fvp-base.bin + cp -a `pwd`/`find . -name FVP_AARCH64_EFI.fd` ${BL33} # Build the semihosting config for OE ${UEFI_TOOLS_DIR}/uefi-build.sh -D ARM_FVP_BOOT_FROM_SEMIHOSTING -b ${TARGET} fvp_minimal @@ -224,19 +224,15 @@ cp -a ${REPO_WORKSPACE}/build/${platform}/release/fip.bin ${builddir}/${platform # For FVP models, build the extra OpenEmbedded and Android FIPs if [ "${platform}" == "fvp" ]; then - mkdir -p ${builddir}/openembedded export BL33=${builddir}/uefi_fvp-base-oe.bin make PLAT=${platform} fip count_errors $? - cp -a ${REPO_WORKSPACE}/build/${platform}/release/bl1.bin ${builddir}/openembedded/${platform}_bl1.bin - cp -a ${REPO_WORKSPACE}/build/${platform}/release/fip.bin ${builddir}/openembedded/${platform}_fip.bin + cp -a ${REPO_WORKSPACE}/build/${platform}/release/fip.bin ${builddir}/${platform}_fip-openembedded.bin - mkdir -p ${builddir}/android export BL33=${builddir}/uefi_fvp-base-android.bin make PLAT=${platform} fip count_errors $? - cp -a ${REPO_WORKSPACE}/build/${platform}/release/bl1.bin ${builddir}/android/${platform}_bl1.bin - cp -a ${REPO_WORKSPACE}/build/${platform}/release/fip.bin ${builddir}/android/${platform}_fip.bin + cp -a ${REPO_WORKSPACE}/build/${platform}/release/fip.bin ${builddir}/${platform}_fip-android.bin fi # If nothing build, return an error |