On 4/10/19 11:34 AM, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
> ---
> OvmfPkg/build.sh | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
> index 4fcbdd2bc9..c92e90acfa 100755
> --- a/OvmfPkg/build.sh
> +++ b/OvmfPkg/build.sh
> @@ -43,7 +43,6 @@ PLATFORMFILE=
> THREADNUMBER=1
> LAST_ARG=
> RUN_QEMU=no
> -ENABLE_FLASH=no
>
> #
> # Pick a default tool type for a given OS
> @@ -110,7 +109,7 @@ do
> break
> ;;
> --enable-flash)
> - ENABLE_FLASH=yes
> + # Ignore old option. We always enable flash.
> ;;
> *)
> BUILD_OPTIONS="$BUILD_OPTIONS $arg"
> @@ -210,7 +209,10 @@ if [[ "$RUN_QEMU" == "yes" ]]; then
> awk '{print $2}')
> case $qemu_version in
> 1.[6-9].*|[2-9].*.*|[1-9][0-9]*.*.*)
> - ENABLE_FLASH=yes
> + ;;
> + *)
> + echo qemu 1.6 or newer is required. detected: $qemu_version
> + exit 1
> ;;
> esac
>
> @@ -258,15 +260,8 @@ fi
>
>
> if [[ "$RUN_QEMU" == "yes" ]]; then
> - if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then
> - mkdir $QEMU_FIRMWARE_DIR
> - fi
> - ln -sf $FV_DIR/OVMF.fd $QEMU_FIRMWARE_DIR/bios.bin
> - if [[ "$ENABLE_FLASH" == "yes" ]]; then
> - QEMU_COMMAND="$QEMU_COMMAND -pflash $QEMU_FIRMWARE_DIR/bios.bin"
> - else
> - QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR"
> - fi
> + FIRMWARE_IMAGE=$FV_DIR/OVMF.fd
> + QEMU_COMMAND="$QEMU_COMMAND -pflash $FIRMWARE_IMAGE"
> if [[ "$ADD_QEMU_HDA" == "yes" ]]; then
> QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH"
> fi
>
Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#38816): https://edk2.groups.io/g/devel/message/38816
Mute This Topic: https://groups.io/mt/31017199/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
