From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.38216.1688991955328364781 for ; Mon, 10 Jul 2023 05:25:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=IC16E+cG; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688991955; x=1720527955; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5dajJIRGziqXGaN0CmG1ThWLWIHlTbUPZA8zD9Vqngw=; b=IC16E+cG4WW/U+B2yFAHHcLkmdA8EbMl1QqAke9lqH01oPv27FlhURUG qa72Q4G64nbYnOlsHj0g5vsR+tRLqrayD7QN0SFLZe9ap4M6x1axMrlfw FSXivcOiP8ZDKSQlvOEAZ/lduHHHivEdJ7Kbo69fEvxNM48Vydv43oFgx WiuqRQcTEh30w+qy0TrP9IqX5fypiqUjx5yxkpLJEXiiA/hMNvMz9gumC iEkE8RuygvL0unXEdqAx/5+8xOJqweLG6nGoLzdF+maPwxN7lboHpKgp7 rFfS/ig1Rto6zKs6kmomOXTlJIQtzxhelfVXGICADj451/vqPS1B0jCps A==; X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="364365329" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="364365329" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 05:25:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="670961888" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="670961888" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga003.jf.intel.com with ESMTP; 10 Jul 2023 05:25:26 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 10 Jul 2023 05:25:25 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 10 Jul 2023 05:25:25 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Mon, 10 Jul 2023 05:25:25 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Mon, 10 Jul 2023 05:25:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W/TxZiGXwkka3K76m2QOb+PNH88OnnQKS/6yuxh1anuxDE2Wiynsbh/Yc8s256k/fPKImOJWtmm1W3YmJzUdk0SyAqG0ic/fODTjsRfeRYDDzkB1RIQarqI1IJWk+y1Ayv1odv5rpVJhs6QADEJmQRJX+inkNXwHdTMG7Gzv3RwBJX9aACrfUzXrG87TbaojTL5cZg35NtqOWSscttT7RZ3oxmjq57Oxrh0bioBnO4i0phyxP5r77JEGU5jxo57WK3LCSQJUcnA3ORvrKl+8TFmRGpZYCD0OODwm6LQzwPxVxvJhuEptEe1WWcjcGZ16JNQikz8Km+xMNS7VZDeUiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NZ5ZcQWZdtDYYRfr4NZYmbHP9Spqf3MHnUrCkDesqtc=; b=e2k5bwp1OstX+kr+Qy0P2asNkbfhMOxde72no9KZC1RhSxFJy2IApq6XKfq6T1vZs/JsNghLIqeQz8Tz6E84b659ICY+QIPu4Ad5diUQP49z52g3km6262fjvKGbVhiC13tq/HyXOfnSyjkSOBYwScaLkYZo5p/dtGMO10fWFANXYwG+OE6Cq1YtgjMYntRcdKuy1kQdrTd4A2xloGIx3iKE3VbBmpdiAgKkhr4yljR0CCA0cPKq0SklSFyhAwDVeUfjRS4obIMVrnMYFV9UNJ4E3guiFEKGRaCW3FYKrDugkoa/gmRDaEjj+agsqlq1F/vTubjrTaHxS1qQQAYjJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by CO1PR11MB4900.namprd11.prod.outlook.com (2603:10b6:303:9e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.31; Mon, 10 Jul 2023 12:25:10 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::fef:fccb:3839:4f36]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::fef:fccb:3839:4f36%5]) with mapi id 15.20.6565.028; Mon, 10 Jul 2023 12:25:10 +0000 From: "Guo, Gua" To: "Lin, MarsX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" Subject: Re: [PATCH] UefiPayloadPkg: Integrate UiApp and BootManagerMenuApp into MultiFv Thread-Topic: [PATCH] UefiPayloadPkg: Integrate UiApp and BootManagerMenuApp into MultiFv Thread-Index: AQHZsw1Ve43pw5RoYEaASUh+s03l7a+y7Ocw Date: Mon, 10 Jul 2023 12:25:09 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|CO1PR11MB4900:EE_ x-ms-office365-filtering-correlation-id: d1467c0f-debf-4c03-8a26-08db8140b3cc x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TOO23+Qr3QAd+sqEfLKW82McR24XKVGG4AMHThu+2I5MLQnDGaJCp6YHsQytD3ggzKHd9smfmJWUympgJS08iukvrMM1H8Gg3+jIzB6oh4v1l+PQJJF/huUCq9zvaMtgp2GQ/KnuLg9iMA9vmAm1lx1QZlBXBOJ0pqzZYen1b5QU+0z69Ed4dRPNycpFIjXPTkxjr1v/mB0lAhSzoY16Saq3NXAwxogJZoqrH06FWP7V30ZpvqChKhakrZeVed77cGpqTYKnKTEeoLLSIvc6j23EVzU7/t7In07cW0sCtZ7I4ORIxD99W1AYPHvRtK+THgN75t4aIbfckw+/U61IRkI9HZJ7rxJRS9EZX+iVJx2esmfdUrkg7URKztDbem6FujR9jJixDoZkHP9JWGCehKv+ls8sDm2xGnyHh/tuhKG2Wm3EPPlb0lnqPu+Xhn2+0FUbYyD93vc+4ohw+ZLS+YvFT5ot/kVpXG5+H9keHAlCCbnmiXrFDpUqeIKBxT4B3JYjgCXeeWyc/BUZMBCgz2RR6o49fROxL8yBFeGPjPtQ19hJbStuuhbcZEocfthy/sGnYG08E8kDSMiufmHCKVIUq1FC3SE0091KTDlAljo= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(6029001)(376002)(346002)(39860400002)(136003)(396003)(366004)(451199021)(52536014)(5660300002)(8676002)(8936002)(316002)(66946007)(66556008)(66476007)(66446008)(64756008)(41300700001)(76116006)(2906002)(4326008)(54906003)(19627235002)(71200400001)(7696005)(966005)(9686003)(6506007)(53546011)(107886003)(26005)(186003)(83380400001)(30864003)(38100700002)(110136005)(478600001)(122000001)(82960400001)(38070700005)(33656002)(55016003)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8eOS97zyHPvsBaxMEe9aGmIHttWOGs7bIYACPJ7cVjOP77Y8pHQ1TAo8Vysk?= =?us-ascii?Q?W28eY8ItOL1vieC4gw4HlvoE0TWIuzRlc1IKl9BqB5MYuAPg5znX37JhnDsS?= =?us-ascii?Q?5ni4cIwfrFOmhkJvXw8Z5PRsKW+OH+HKfMSKwmBc/pqE/UhgeybkDCp5JuBh?= =?us-ascii?Q?N3D73fLFgowouU28oe2c8pfhYG/4SoX6vzXpe0L2oWkIQTIy6IBEDSwZJKD9?= =?us-ascii?Q?HTNf7Iar/jegqlsrFsgakCblsSw2bZAu36PFjQxkyzcMNFWZ39bvzF4e2854?= =?us-ascii?Q?tpgJe3w7Kf8UfSq6x/oJos6xj/zruKdRgyUgq1YDaK8HhJwgSE1kBz+PCH5G?= =?us-ascii?Q?SSs/nyeXGig3adt+rF6ILOyIYIPY7S+eXetXk1FFKII+47W7/sWPSr/LDK0t?= =?us-ascii?Q?EnzlpCxtC+Qd7goRYc2UfTKXo7mek3ivw3WWpnB9sGnyaI0yJxykz98Vkhhp?= =?us-ascii?Q?3z16qfWq/TBb0TTac7nysAsgBZ7VgiHElygyyV7ESppqJ999F4Kxko/RT7rf?= =?us-ascii?Q?S0AvczeiuoyZr25g+186TokNOjoNC1/O+aWgo8949aoLtxMfQrQpROBTRC4g?= =?us-ascii?Q?9XD3vklyoE8QKuazY9qUWvwdeswSX0sDpVvcVBBGf9yxIxEfXKYMKmJ0GC+Y?= =?us-ascii?Q?PR6L4HjZ7yPhpczteVgIaCdr/Uz4L+T/nLwr4GOfmOI/86mOuvUebfux9uoJ?= =?us-ascii?Q?jEqtcpCeUOU8P9wE1ogx4v8eq3U0uxSz2TJkQ83vOIhLpE6XGFI8XmB5B/JQ?= =?us-ascii?Q?KIs1Z8jbenKdAvc86a4kzPNntIl48zN2UYMvAVchD+jdXJqC2fzXK0Mdupk6?= =?us-ascii?Q?i+YsmAmNJR1A+DEum86CynCN58A/eWE078/+qEY9nRKhfoFGD4Js7vrLQzT1?= =?us-ascii?Q?PdlEavwIcFg2Z6EN3HZZLzB8vQvy96uIGav4fz6JAivF4+jK4m6XDnEsdkT9?= =?us-ascii?Q?QIWZDvpyvMUEPYhGsUIq4OeGqY3cVHA1JDNdGreWsprNU1K0jNipLY75VV0E?= =?us-ascii?Q?ahlH9eesD9ggtbnJ+HPMgERCD5STgPpKDh/j2C4MV6ikk9GNCIPcfS52WL0R?= =?us-ascii?Q?v/XdaoxBU0oYQUEIsHhpTlwiIn+VEtsQfCmVxXww6+CBQJgjGGkS5+CmNDxA?= =?us-ascii?Q?Pv6fv1CDYUTiqdwUxffpkEiJCYrMQUoNftlfOxuDzD96r3zkHI6MR1n2N1C7?= =?us-ascii?Q?zG2zQxWK+02ZCFGfPQoetGOZbpiEaNXr1F4MMpWejkIhK9w60bs6uP17HTVs?= =?us-ascii?Q?UGdiCASvw7M2mI3jwq1JBTdhKHwTWvrFrsO0FgVMbuEYwPikv0U8W67jAyfZ?= =?us-ascii?Q?EuyQ5cPJG2VyiJJGPmnTymu7fKyRkwzB6iSDtmic8eJ66YDGS5OVDY41zsk3?= =?us-ascii?Q?4iqC9EPIwU/Z+9nlgf+/ctkKYpDkZ3hw1Tg1ujg5ZVPv2ca8dR0ZLBU2mofo?= =?us-ascii?Q?Xh/sPnjS3ZwkHsgQuau4OswoJ+Im1Krf/mVXzHxxLRix8mKO4TyD1hmtOJec?= =?us-ascii?Q?7WUTiOn33xR3BgRQorDzE1C56p/IfQwxTNuDq3J1p6kVutrt8bz8zi6K+2KV?= =?us-ascii?Q?GfVrY3TLx0B4fmkS+4g=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1467c0f-debf-4c03-8a26-08db8140b3cc X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2023 12:25:09.7158 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: BsieYcxxjJSqMBdqwWAp6vGhdygcHXK05Eu0H0oynEllQN0/ppl8VOSwBknnHmyvOcwMA3m0MacJK/i1jXH87w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4900 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Gua Guo =20 -----Original Message----- From: Lin, MarsX =20 Sent: Monday, July 10, 2023 5:02 PM To: devel@edk2.groups.io Cc: Lin, MarsX ; Dong, Guo ; Ni, R= ay ; Rhodes, Sean ; Lu, James ; Guo, Gua Subject: [PATCH] UefiPayloadPkg: Integrate UiApp and BootManagerMenuApp int= o MultiFv From: MarsX Lin REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4347 To put UiApp.inf and BootManagerMenuApp.inf to proper FV(BDSFV) Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: MarsX Lin --- .../PlatformBootManager.c | 55 ------------------- .../PlatformBootManagerLib.inf | 4 -- UefiPayloadPkg/UefiPayloadEntry/PrintHob.c | 25 +-------- .../UniversalPayloadEntry.inf | 1 - UefiPayloadPkg/UefiPayloadPkg.dec | 2 - UefiPayloadPkg/UefiPayloadPkg.dsc | 8 +-- UefiPayloadPkg/UefiPayloadPkg.fdf | 9 ++- 7 files changed, 11 insertions(+), 93 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 4a0219624d..a4a49da0e9 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -9,8 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "PlatformBootManager.h" #include "PlatformConsole.h" -#include -#include #include =20 /** @@ -364,56 +362,3 @@ PlatformBootManagerUnableToBoot ( { return; } - -/** - Get/update PcdBootManagerMenuFile from GUID HOB which will be assigned i= n bootloader. - - @param ImageHandle The firmware allocated handle for the EFI image. - @param SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - @retval other Some error occurs. - -**/ -EFI_STATUS -EFIAPI -PlatformBootManagerLibConstructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - UINTN Size; - VOID *GuidHob; - UNIVERSAL_PAYLOAD_GENERIC_HEADER *GenericHeader; - UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *BootManagerMenuFile; - - GuidHob =3D GetFirstGuidHob (&gEdkiiBootManagerMenuFileGuid); - - if (GuidHob =3D=3D NULL) { - // - // If the HOB is not create, the default value of PcdBootManagerMenuFi= le will be used. - // - return EFI_SUCCESS; - } - - GenericHeader =3D (UNIVERSAL_PAYLOAD_GENERIC_HEADER *)GET_GUID_HOB_DATA = (GuidHob); - if ((sizeof (UNIVERSAL_PAYLOAD_GENERIC_HEADER) > GET_GUID_HOB_DATA_SIZE = (GuidHob)) || (GenericHeader->Length > GET_GUID_HOB_DATA_SIZE (GuidHob))) { - return EFI_NOT_FOUND; - } - - if (GenericHeader->Revision =3D=3D UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_R= EVISION) { - BootManagerMenuFile =3D (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *)GET_GUI= D_HOB_DATA (GuidHob); - if (BootManagerMenuFile->Header.Length < UNIVERSAL_PAYLOAD_SIZEOF_THRO= UGH_FIELD (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU, FileName)) { - return EFI_NOT_FOUND; - } - - Size =3D sizeof (BootManagerMenuFile->FileName); - Status =3D PcdSetPtrS (PcdBootManagerMenuFile, &Size, &BootManagerMenu= File->FileName); - ASSERT_EFI_ERROR (Status); - } else { - return EFI_NOT_FOUND; - } - - return EFI_SUCCESS; -} diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf index a3951b7a7e..ff92c95227 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf @@ -13,7 +13,6 @@ MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D PlatformBootManagerLib|DXE_DRIVER - CONSTRUCTOR =3D PlatformBootManagerLibConstructor =20 # # The following information is for reference only and not required by the = build tools. @@ -48,11 +47,9 @@ HiiLib PrintLib PlatformHookLib - HobLib =20 [Guids] gEfiEndOfDxeEventGroupGuid - gEdkiiBootManagerMenuFileGuid gUefiShellFileGuid =20 [Protocols] @@ -75,5 +72,4 @@ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits - gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile gUefiPayloadPkgTokenSpaceGuid.PcdBootManagerEscape diff --git a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c b/UefiPayloadPkg/Ue= fiPayloadEntry/PrintHob.c index e959be5d95..3b2b7788d4 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c +++ b/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c @@ -10,7 +10,6 @@ #include #include #include -#include =20 #define ROW_LIMITER 16 =20 @@ -437,27 +436,6 @@ PrintMemoryTypeInfoGuidHob ( return EFI_SUCCESS; } =20 -/** - Print the information in EdkiiBootManagerMenuFileGuid. - @param[in] HobRaw A pointer to the start of gEdkiiBootManagerMe= nuFileGuid HOB. - @param[in] HobLength The size of the HOB data buffer. - @retval EFI_SUCCESS If it completed successfully. -**/ -EFI_STATUS -PrintBootManagerMenuGuidHob ( - IN UINT8 *HobRaw, - IN UINT16 HobLength - ) -{ - UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *BootManagerMenuFile; - - BootManagerMenuFile =3D (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *)GET_GUID_= HOB_DATA (HobRaw); - ASSERT (HobLength >=3D sizeof (*BootManagerMenuFile)); - DEBUG ((DEBUG_INFO, " Revision =3D 0x%x\n", BootManagerMenuFile->Head= er.Revision)); - DEBUG ((DEBUG_INFO, " Length =3D 0x%x\n", BootManagerMenuFile->Head= er.Length)); - DEBUG ((DEBUG_INFO, " FileName =3D %g\n", &BootManagerMenuFile->FileN= ame)); - return EFI_SUCCESS; -} =20 // // Mappint table for dump Guid Hob information. @@ -471,8 +449,7 @@ GUID_HOB_PRINT_HANDLE GuidHobPrintHandleTable[] =3D { { &gUefiAcpiBoardInfoGuid, PrintAcpiBoardInfoGuidHob, = "gUefiAcpiBoardInfoGuid(Acpi Guid)" }, { &gUniversalPayloadPciRootBridgeInfoGuid, PrintPciRootBridgeInfoGuidHob= , "gUniversalPayloadPciRootBridgeInfoGuid(Pci Guid)" }, { &gEfiMemoryTypeInformationGuid, PrintMemoryTypeInfoGuidHob, = "gEfiMemoryTypeInformationGuid(Memory Type Information Guid)" }, - { &gUniversalPayloadExtraDataGuid, PrintExtraDataGuidHob, = "gUniversalPayloadExtraDataGuid(PayLoad Extra Data Guid)" }, - { &gEdkiiBootManagerMenuFileGuid, PrintBootManagerMenuGuidHob, = "gEdkiiBootManagerMenuFileGuid(Boot Manager Menu File Guid)" } + { &gUniversalPayloadExtraDataGuid, PrintExtraDataGuidHob, = "gUniversalPayloadExtraDataGuid(PayLoad Extra Data Guid)" } }; =20 /** diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/Ue= fiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf index c4f4f28eaa..5112cdc1e5 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf @@ -69,7 +69,6 @@ gUniversalPayloadAcpiTableGuid gUniversalPayloadPciRootBridgeInfoGuid gUniversalPayloadSmbios3TableGuid - gEdkiiBootManagerMenuFileGuid =20 [FeaturePcd.IA32] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUME= S diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec index 8d111f3a90..e2e4a79db3 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -29,8 +29,6 @@ # gBmpImageGuid =3D { 0x878AC2CC, 0x5343, 0x46F2= , { 0xB5, 0x63, 0x51, 0xF8, 0x9D, 0xAF, 0x56, 0xBA } } =20 - ##include/Guid/BootManagerMenu.h - gEdkiiBootManagerMenuFileGuid =3D { 0xdf939333, 0x42fc, 0x4b2a, { 0xa5, = 0x9e, 0xbb, 0xae, 0x82, 0x81, 0xfe, 0xef }} gEdkiiDebugPrintErrorLevelGuid =3D { 0xad82f436, 0x75c5, 0x4aa9, { 0x92,= 0x93, 0xc5, 0x55, 0x0a, 0x7f, 0xf9, 0x71 }} gUefiAcpiBoardInfoGuid =3D {0xad3d31b, 0xb3d8, 0x4506, {0xae, 0x71, 0x= 2e, 0xf1, 0x10, 0x6, 0xd9, 0xf}} gUefiSerialPortInfoGuid =3D { 0x6c6872fe, 0x56a9, 0x4403, { 0xbb, 0x98,= 0x95, 0x8d, 0x62, 0xde, 0x87, 0xf1 } } diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 849645a876..47812048dd 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -441,6 +441,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE =20 + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x80,= 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 } =20 !if $(SOURCE_DEBUG_ENABLE) @@ -651,10 +652,9 @@ NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc= eManagerUiLib.inf } - MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf { - - NULL|UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf - } + MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + + PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf MdeModulePkg/Universal/Metronome/Metronome.inf MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index f8c2aa8c4a..835798be1c 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,7 +59,7 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } - +!if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE !if $(NETWORK_DRIVER_ENABLE) =3D=3D TRUE ##########################################################################= ###### [FV.NETWORKFV] @@ -112,6 +112,9 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf +INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf +!endif =20 [FV.DXEFV] FvNameGuid =3D 8063C21A-8E58-4576-95CE-089E87975D23 @@ -158,8 +161,6 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStub= Dxe.inf !endif INF UefiCpuPkg/CpuDxe/CpuDxe.inf =20 -INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf -INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf @@ -305,6 +306,8 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTa= bleDxe/BootGraphicsResour =20 !if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf +INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf # # UEFI network modules # --=20 2.39.1.windows.1