From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 E8B0B21A18AA9 for ; Mon, 17 Apr 2017 21:56:50 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Apr 2017 21:56:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,218,1488873600"; d="dat'59?scan'59,208,59";a="1137004772" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 17 Apr 2017 21:56:50 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 17 Apr 2017 21:56:50 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 17 Apr 2017 21:56:50 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.117]) by shsmsx102.ccr.corp.intel.com ([169.254.2.246]) with mapi id 14.03.0319.002; Tue, 18 Apr 2017 12:56:46 +0800 From: "Guo, Mang" To: "edk2-devel@lists.01.org" CC: "Wei, David" , "Lu, ShifeiX A" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoard3] Fix setup assert issue Thread-Index: AdK4AC4xZ2es3pyZR+aoMGsTdXLhRA== Date: Tue, 18 Apr 2017 04:56:46 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D15250364D@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D15250364D@SHSMSX103.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 Subject: [Patch][edk2-platforms/devel-MinnowBoard3] Fix setup assert issue 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: Tue, 18 Apr 2017 04:56:51 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Debug BIOS will assert if change setup and save. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Guo Mang --- .../PlatformSettings/PlatformSetupDxe/SetupInfoRecords.c | 15 +----------= ---- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSe= tupDxe/SetupInfoRecords.c b/Platform/BroxtonPlatformPkg/Common/PlatformSett= ings/PlatformSetupDxe/SetupInfoRecords.c index d504995..768893e 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/= SetupInfoRecords.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/= SetupInfoRecords.c @@ -1808,7 +1808,6 @@ CheckSystemConfigSave ( SEC_INFOMATION SeCInfo; UINT8 SecureBootCfg; UINTN DataSize; - BOOLEAN SecureBootNotFound; =20 Status =3D gBS->LocateProtocol ( &gEfiSeCOperationProtocolGuid, @@ -1831,7 +1830,6 @@ CheckSystemConfigSave ( // Secure Boot configuration changes // DataSize =3D sizeof (SecureBootCfg); - SecureBootNotFound =3D FALSE; Status =3D gRT->GetVariable ( EFI_SECURE_BOOT_ENABLE_NAME, &gEfiSecureBootEnableDisableGuid, @@ -1841,18 +1839,7 @@ CheckSystemConfigSave ( ); =20 if (EFI_ERROR (Status)) { - SecureBootNotFound =3D TRUE; - } - - if (SecureBootNotFound) { - Status =3D gRT->GetVariable ( - EFI_SECURE_BOOT_ENABLE_NAME, - &gEfiSecureBootEnableDisableGuid, - NULL, - &DataSize, - &SecureBootCfg - ); - ASSERT_EFI_ERROR (Status); + SecureBootCfg =3D 0; } =20 if ((SecureBootCfg) !=3D SystemConfigPtr->SecureBoot) { --=20 2.10.1.windows.1