diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2015-06-22 14:14:35 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2015-06-22 14:15:56 +0100 |
| commit | a8ad4e4064db078dac77ba94d1d02e669b7606c0 (patch) | |
| tree | 5fe1212110844d8a788c1437042487c1ae7f1ce3 | |
| parent | 70211827e9301233ee2814bfc5b55fd3586be8ef (diff) | |
Add UEFI_BINARY variable
UEFI does not always output the same filename for every platform, so add
the UEFI_BINARY variable to allow the variant to specify the filename.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | build-uefi.sh | 4 | ||||
| -rw-r--r-- | variants/juno-busybox | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build-uefi.sh b/build-uefi.sh index a576833..faf13ad 100755 --- a/build-uefi.sh +++ b/build-uefi.sh @@ -41,7 +41,7 @@ # UEFI_BUILD_MODE - DEBUG or RELEASE # UEFI_TOOLCHAIN - Toolchain supported by Linaro uefi-tools: GCC49, GCC48 or GCC47 # UEFI_OUTPUT_PLATFORMS - list of outputs to export - +# UEFI_BINARY - the filename of the UEFI binary do_build () { if [ "$UEFI_BUILD_ENABLED" == "1" ]; then @@ -85,7 +85,7 @@ do_package () pushd $TOP_DIR for item in $UEFI_OUTPUT_PLATFORMS; do mkdir -p ${OUTDIR}/${UEFI_OUTPUT_DESTS[$item]} - cp ./$UEFI_PATH/Build/$item/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/FV/BL33_AP_UEFI.fd \ + cp ./$UEFI_PATH/Build/$item/${UEFI_BUILD_MODE}_${UEFI_TOOLCHAIN}/FV/${UEFI_BINARY} \ ${OUTDIR}/${UEFI_OUTPUT_DESTS[$item]}/uefi.bin done popd diff --git a/variants/juno-busybox b/variants/juno-busybox index 161e7c2..02802a8 100644 --- a/variants/juno-busybox +++ b/variants/juno-busybox @@ -55,6 +55,7 @@ BUILD_SCRIPTS=$BUILD_SCRIPTS"build-uefi.sh " UEFI_PATH=uefi/edk2 UEFI_TOOLS_PATH=uefi/uefi-tools UEFI_PLATFORMS="ArmPlatformPkg/ArmJunoPkg/Makefile" +UEFI_BINARY="BL33_AP_UEFI.fd" UEFI_BUILD_MODE=DEBUG UEFI_TOOLCHAIN=GCC49 UEFI_OUTPUT_PLATFORMS="ArmJuno" |