From nobody Mon Apr 29 16:37:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1521709274606704.2401150390805; Thu, 22 Mar 2018 02:01:14 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 29D7922551BBB; Thu, 22 Mar 2018 01:54:41 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 EA89D22551B9F for ; Thu, 22 Mar 2018 01:54:39 -0700 (PDT) Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2018 02:01:10 -0700 Received: from zwei4-mobl1.ccr.corp.intel.com ([10.239.192.255]) by orsmga008.jf.intel.com with ESMTP; 22 Mar 2018 02:01:09 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=david.wei@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,343,1517904000"; d="scan'208";a="27449929" From: zwei4 To: edk2-devel@lists.01.org Date: Thu, 22 Mar 2018 17:01:05 +0800 Message-Id: <20180322090105.6360-1-david.wei@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 Subject: [edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BDS module. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Change from BDS of IntelFrameworkModulePkg to BDS of MdeModulePkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: zwei4 --- .../Common/Library/PlatformBootManagerLib/PlatformBootManager.c | 5 +---- Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc | 9 +++++= +++- Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc | 3 +++ Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManager= Lib/PlatformBootManager.c b/Platform/BroxtonPlatformPkg/Common/Library/Plat= formBootManagerLib/PlatformBootManager.c index 3dffe72636..7c7a98e2b9 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/Pla= tformBootManager.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/Pla= tformBootManager.c @@ -35,7 +35,6 @@ #include #include =20 -#pragma optimize("g", off) =20 #define TIMEOUT_COMMAND 100000 #define BIOS_COLOR_CODING_BAR_HEIGHT 40 @@ -635,8 +634,6 @@ UpdateDevicePath ( return Return; } =20 -#pragma optimize("g", off) - /** Check if current BootCurrent variable is internal shell boot option. =20 @@ -1047,6 +1044,6 @@ PlatformBootManagerAfterConsole ( } =20 if (IsNeedSortBootOption()) { - EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, CompareBootO= ption); + EfiBootManagerSortLoadOptionVariable (LoadOptionTypeBoot, (SORT_COMPAR= E)CompareBootOption); } } diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc b/Platf= orm/BroxtonPlatformPkg/PlatformDsc/Components.dsc index 3135d4dc69..c6313cdd5d 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/Components.dsc @@ -107,7 +107,7 @@ GCC:*_*_*_CC_FLAGS =3D -D MDEPKG_NDEBUG } =20 - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf { + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -116,6 +116,13 @@ NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf NULL|$(PLATFORM_PACKAGE_COMMON)/Library/Tpm2DeviceLibPtp/Tpm2Instanc= eLibPtt.inf } + MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + MdeModulePkg/Application/UiApp/UiApp.inf { + + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc= eManagerUiLib.inf + } =20 $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyDxe/F= spNotifyDxe.inf =20 diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc b/P= latform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc index a4bc20973d..2320d2f9c6 100644 --- a/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc +++ b/Platform/BroxtonPlatformPkg/PlatformDsc/LibraryClasses.dsc @@ -272,3 +272,6 @@ =20 BltLib|$(PLATFORM_PACKAGE_COMMON)/Library/FrameBufferBltLib/FrameBuffer= BltLib.inf =20 + UefiBootManagerLib | MdeModulePkg/Library/UefiBootManagerLib/UefiBootMa= nagerLib.inf + PlatformBootManagerLib | Platform/BroxtonPlatformPkg/Common/Library/Pla= tformBootManagerLib/PlatformBootManagerLib.inf + BootLogoLib | MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf \ No newline at end of file diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/Broxton= PlatformPkg/PlatformPkg.fdf index 9af77d5901..80184c0526 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -527,7 +527,9 @@ APRIORI DXE { INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf =20 - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf =20 !if $(TOOL_CHAIN_TAG) !=3D GCC5 INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspNotifyD= xe/FspNotifyDxe.inf @@ -752,7 +754,7 @@ APRIORI DXE { # # UEFI Shell # - FILE APPLICATION =3D PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSh= ellFile) { + FILE APPLICATION =3D 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 { SECTION PE32 =3D ShellBinPkg/UefiShell/$(IA32_X64_LC)/Shell.efi } =20 --=20 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel