diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-07-28 18:12:11 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-07-28 18:12:11 +0000 |
| commit | 3f35b140e14cf1e95ec9621adedaa29890ac4fc9 (patch) | |
| tree | 1e64ebda5cd51e69a9193235c7634b4ce9f6896b | |
| parent | 1c023eb357632f1506d559ed54303ccee71ddf16 (diff) | |
| download | edk2-3f35b140e14cf1e95ec9621adedaa29890ac4fc9.tar.gz edk2-3f35b140e14cf1e95ec9621adedaa29890ac4fc9.tar.bz2 edk2-3f35b140e14cf1e95ec9621adedaa29890ac4fc9.zip | |
OvmfPkg/build.sh: Support IA32+X64 build
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15703 6f19259b-4bc3-4df7-8a09-765794883524
| -rwxr-xr-x | OvmfPkg/build.sh | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh index c3cc72e269..b549ab57c2 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -41,7 +41,8 @@ fi # Configure defaults for various options # -PROCESSOR=X64 +ARCH_IA32=no +ARCH_X64=no BUILDTARGET=DEBUG BUILD_OPTIONS= PLATFORMFILE= @@ -123,7 +124,12 @@ do else case $LAST_ARG in -a) - PROCESSOR=$arg + if [[ x"$arg" != x"IA32" && x"$arg" != x"X64" ]]; then + echo Unsupported processor architecture: $arg + echo Only IA32 or X64 is supported + exit 1 + fi + eval ARCH_$arg=yes ;; -b) BUILDTARGET=$arg @@ -146,9 +152,28 @@ do shift done +if [[ "$ARCH_IA32" == "yes" && "$ARCH_X64" == "yes" ]]; then + PROCESSOR=IA32X64 + Processor=Ia32X64 + BUILD_OPTIONS="$BUILD_OPTIONS -a IA32 -a X64" + PLATFORM_BUILD_DIR=Ovmf3264 + BUILD_ROOT_ARCH=X64 +elif [[ "$ARCH_IA32" == "yes" && "$ARCH_X64" == "no" ]]; then + PROCESSOR=IA32 + Processor=Ia32 + BUILD_OPTIONS="$BUILD_OPTIONS -a IA32" + PLATFORM_BUILD_DIR=Ovmf$Processor + BUILD_ROOT_ARCH=$PROCESSOR +else + PROCESSOR=X64 + Processor=X64 + BUILD_OPTIONS="$BUILD_OPTIONS -a X64" + PLATFORM_BUILD_DIR=Ovmf$Processor + BUILD_ROOT_ARCH=X64 +fi + case $PROCESSOR in IA32) - Processor=Ia32 if [ -n "$QEMU_COMMAND" ]; then # # The user set the QEMU_COMMAND variable. We'll use it to run QEMU. @@ -165,8 +190,7 @@ case $PROCESSOR in exit 1 fi ;; - X64) - Processor=X64 + X64|IA32X64) if [ -z "$QEMU_COMMAND" ]; then # # The user didn't set the QEMU_COMMAND variable. @@ -216,9 +240,9 @@ fi #echo Remaining for qemu: $* #exit 1 -BUILD_ROOT=$WORKSPACE/Build/Ovmf$Processor/"$BUILDTARGET"_"$TARGET_TOOLS" +BUILD_ROOT=$WORKSPACE/Build/$PLATFORM_BUILD_DIR/"$BUILDTARGET"_"$TARGET_TOOLS" FV_DIR=$BUILD_ROOT/FV -BUILD_ROOT_ARCH=$BUILD_ROOT/$PROCESSOR +BUILD_ROOT_ARCH=$BUILD_ROOT/$BUILD_ROOT_ARCH QEMU_FIRMWARE_DIR=$BUILD_ROOT/QEMU if [[ ! -f `which build` || ! -f `which GenFv` ]]; @@ -259,6 +283,6 @@ fi # Build the edk2 OvmfPkg # echo Running edk2 build for OvmfPkg$Processor -build -p $PLATFORMFILE $BUILD_OPTIONS -a $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS -n $THREADNUMBER +build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n $THREADNUMBER exit $? |