From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D066621BC6A7F for ; Mon, 27 Mar 2017 01:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490602133; x=1522138133; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=m41ijY/6IIXwba/baponEMPF3supTeYe7yj8EhU1iqU=; b=Jnrtg1civMjyPKee3HufuYF+25dr+cMt5PlRpnDCX4Yzo0tRBg0GetJR +5dlcLYRtfvMQDY4DD2CeMfh7mduwA==; Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Mar 2017 01:08:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,229,1486454400"; d="scan'208";a="80948324" Received: from junghyun-mobl.amr.corp.intel.com (HELO jljusten-skl.amr.corp.intel.com) ([10.252.131.12]) by fmsmga005.fm.intel.com with ESMTP; 27 Mar 2017 01:08:51 -0700 From: Jordan Justen To: edk2-devel@lists.01.org Cc: Jordan Justen , Laszlo Ersek Date: Mon, 27 Mar 2017 01:05:33 -0700 Message-Id: <20170327080544.24748-2-jordan.l.justen@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170327080544.24748-1-jordan.l.justen@intel.com> References: <20170327080544.24748-1-jordan.l.justen@intel.com> Subject: [PATCH 01/12] OvmfPkg/build.sh: Add support for --disable-flash switch X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2017 08:08:54 -0000 This is mainly useful to test the boot paths when flash hasn't been enabled. Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen --- OvmfPkg/build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh index 6821552025..7294198e2c 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -50,6 +50,7 @@ THREADNUMBER=1 LAST_ARG= RUN_QEMU=no ENABLE_FLASH=no +DISABLE_FLASH=no # # Pick a default tool type for a given OS @@ -127,6 +128,9 @@ do shift break ;; + --disable-flash) + DISABLE_FLASH=yes + ;; --enable-flash) ENABLE_FLASH=yes ;; @@ -228,7 +232,9 @@ if [[ "$RUN_QEMU" == "yes" ]]; then awk '{print $2}') case $qemu_version in 1.[6-9].*|1.[1-9][0-9].*|2.*.*) - ENABLE_FLASH=yes + if [[ "$DISABLE_FLASH" != "yes" ]]; then + ENABLE_FLASH=yes + fi ;; esac @@ -283,7 +289,7 @@ if [[ "$RUN_QEMU" == "yes" ]]; then if [[ "$ENABLE_FLASH" == "yes" ]]; then QEMU_COMMAND="$QEMU_COMMAND -pflash $QEMU_FIRMWARE_DIR/bios.bin" else - QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR" + QEMU_COMMAND="$QEMU_COMMAND -L $QEMU_FIRMWARE_DIR -bios $QEMU_FIRMWARE_DIR/bios.bin" fi if [[ "$ADD_QEMU_HDA" == "yes" ]]; then QEMU_COMMAND="$QEMU_COMMAND -hda fat:$BUILD_ROOT_ARCH" -- 2.11.0