From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.121546.1683006973233776543 for ; Mon, 01 May 2023 22:56:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=j/B/gpbb; spf=pass (domain: intel.com, ip: 192.55.52.88, 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=1683006973; x=1714542973; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=mAU39USJ5aap1DQ3AV4mzA4AQ4TJlvUvX2sGruPoaIo=; b=j/B/gpbbHRkLYdFtSvcgDnlgWsxDMpQevHGjRgEJnwgMBtzw96CN657H +Kya6CjlNqVrmKWpWaYejfTxo08m+tZNVRQM2GIOsNQlTcOKCwSIYKRpJ D0wdMlO0xSL+jOWO0Q+D1NtPtdzeFiP9SFoLHdhPeOdmnc6evnr9lgXHc DBjYqI/t+AHY82rajcB2usWnHKM92UnOB2ak2mZNDvLEXlvctXjGLcakx 7ApA2HKrIEXAkII+Qn28W4I6xmhG5CejX2MYZlwxbOJ6ZR4OKsEMzEwuv 6v0Vd4eCX0bHAm5gQnwuqK+9RxIaMIbqGcDFgeMzOsVxa/wW5un97U4gN A==; X-IronPort-AV: E=McAfee;i="6600,9927,10697"; a="376374375" X-IronPort-AV: E=Sophos;i="5.99,243,1677571200"; d="scan'208";a="376374375" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 May 2023 22:56:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10697"; a="726613448" X-IronPort-AV: E=Sophos;i="5.99,243,1677571200"; d="scan'208";a="726613448" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP; 01 May 2023 22:56:07 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) 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.23; Mon, 1 May 2023 22:56:06 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 1 May 2023 22:56:06 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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.23 via Frontend Transport; Mon, 1 May 2023 22:56:06 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.45) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 1 May 2023 22:56:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IpmYdYsBH7uNbUcEIpbQ0JY4KN8QR/b1uI/gg2pXFvUWZLaIwtxb46LxOeFT6bU7pnB56HDj8oJCJb3LJUddmxB0SnCME3isApKCbMbM+yRuDIGTkV01wj5UhQWKLH402freP1qynIySvX2Nq1CojQ4MOyYjAGdY4k2k/sSjWR64k9S0O+mpZuHzdnEIfSphta2Ho3gvBfkBf+jlp/JquQ50PSIS/G+lE1IaICpG6JqBCmPlVzZqXpXmppPj8yKl82iNVHyFvCMyTUJOSEE7AoJLgm37x1U9fa0PZnULGYg1cW8BAq3cvsMHM71EQoekuo0TBdTUrGTslCX3DUF5kw== 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=BKJfd9/G/Q+JNCDugu1iY5QQZhwDIh7ThkcJ5fKGAlE=; b=BhYiEdOInNeF/hkBsSAVMINTrNoQ1Uoy4Mco2TWRReqOAHQMgqyZ3y24jbABOYSZpESQX6VN0w1aHgSwQG8+w9gn/h9AMBay3MZYREx+DskailgytFaKB5G0GZJu9T7JHNDqFn/QazCTYQCCQ0im67bVtzuN36UXf01Y39YZD4jz2QJBOYaI2RkrZZOl9r6shPKtTQXGpRNiFDY6Aj79gyBgA04kfvMYwMnQ3W2HILqHwIKzyrPzuJ6z2FkZYWNfv5PnCwfmdgcWWXAqzyDcafyOMlGBMhW/LK9izFffhXs7dqLrnBb/rPxNSNoerLnwqE7RZl2qgxHTLvBH//IPig== 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 SJ0PR11MB5680.namprd11.prod.outlook.com (2603:10b6:a03:305::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.30; Tue, 2 May 2023 05:56:02 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::2176:be49:df74:bcc7]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::2176:be49:df74:bcc7%3]) with mapi id 15.20.6340.031; Tue, 2 May 2023 05:56:02 +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 BdsFv Thread-Topic: [PATCH] UefiPayloadPkg: Integrate UiApp and BootManagerMenuApp into MultiFv BdsFv Thread-Index: AQHZfKZHmARyIuGDA0mzAVPuUP37Va9GfB4A Date: Tue, 2 May 2023 05:56:01 +0000 Message-ID: References: <991ab64c70bb6fad9476ba7f81a0b013d090151e.1682997883.git.marsx.lin@intel.com> In-Reply-To: <991ab64c70bb6fad9476ba7f81a0b013d090151e.1682997883.git.marsx.lin@intel.com> 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_|SJ0PR11MB5680:EE_ x-ms-office365-filtering-correlation-id: b93cda34-eaef-410e-6bf7-08db4ad1e8f6 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: 2BIuqGd1Dmdj+w5KLh8cPK6ka1YU2hXAdKSz8dpM9YVxAzkKkKtBqc0uv0QyYhh+Vveua6wbte5Vqo4P+MU+5LMAiIfOB7CQKTnm64CXg0djC9soZ3Wk75fOnUQ0StGMCQB6T6vm+YoqjCyvXDulTvmYb5OWzTf0mh8RaK+TrvGRF+4OISpdtvhx0LeBwqCoZSOPNY/7VCom9xsdUcpG12FH8O2tSeUv2eStXIFvxtbBI8XhhbmpB9eGAmKLDyXFlauN+aoep473NC1BRDPHB5J7zmfVgTukNr5oGVpHL5z9K/1V0c7giCnQ5vWoet0TdVH1Bxn+8Gxio8EDm0S2rCiPrtIX0MK+Ki4cvSCNUUm2A6HXGpWBiwWntO0kZCyQRx7UTUqHOkV6d2skiANe+cVCFWakVSOaiSD17wTBXsdrY2ayqyWguEvWNHgwZvJyBbObPWJjYYaf835yUpw4K66RoMeyozbDFDsG+QWVmFNfKw+dhLbHIe8QoUSHaSmYwAkuKtG02j4XQFJRUAzeUvTS37oHdtSWYp6ePNGHigF8a6XlvY1ZB+eA9netRWBx7XoqyoNqWsAwvvu62Rh5jG9bX0bis8hPtXLtRxeAmArNbMJST+wzrrH1XMqB5kBR 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)(396003)(39860400002)(136003)(366004)(376002)(346002)(451199021)(8936002)(8676002)(38070700005)(30864003)(2906002)(53546011)(6506007)(9686003)(26005)(41300700001)(83380400001)(52536014)(38100700002)(5660300002)(122000001)(316002)(82960400001)(4326008)(66556008)(64756008)(186003)(66446008)(66476007)(66946007)(76116006)(86362001)(71200400001)(33656002)(966005)(110136005)(55016003)(54906003)(19627235002)(107886003)(7696005)(478600001)(17423001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?tdrKXwAB5xLhpzKSjmMp0eXi6ZBV/t8A5IWyWBTJiTyUTbdRSMtJmwf7kqlb?= =?us-ascii?Q?C+k50AlloFc+HLQBZT6wM5HXzB+tyXyao3ttG0XOd/4EvUDkVkuq81MoLgVH?= =?us-ascii?Q?7rcEPk8btct6E3xEHg0GgA9+A172XwHOObvlRYTDZW7t9HnBfjvmhim7k3yo?= =?us-ascii?Q?XJtH6GVg3athI7IKxFO8130+qmVM1RulxcMnXbyoWk1+P1mjZeOt08teHAxb?= =?us-ascii?Q?zXFHBfygyAS0A1vzZO/ScNdtRh9jOwnrtP4YQgnjLItpfrM3xdmem/Pstjp2?= =?us-ascii?Q?318ctEyrG/Aa7QSOeCbRiyKS60TmJozQjtMeyU72dTBbPmnLQHAlSM+QRQAo?= =?us-ascii?Q?JelFGwjDAWyeszVeVJxDxQhPyAXgBuGF3ktcpYMGihLMaW/U0mG2nbrZXnVu?= =?us-ascii?Q?d28zteOTGOQgVnjYWFeDKpPEGGcVURwjBs54p6XWnXv/v2a0OlxZaThzJXK1?= =?us-ascii?Q?jypwaVZZvHPTa8DimDjs/04M2N1iS7OES6wkgCwZ3itTEF2zSqdrY+vf1oJM?= =?us-ascii?Q?jpGGXpmfIKPE+BTgu1ujhGvuEmtlghETeafZlMkUU05aPdvFlLjGB71rV0jh?= =?us-ascii?Q?svBDBY9HFHfqrHQqilLlC4hBQ+qu2RCzw3DjKBRILu3F3PFFhSuWool6U8fm?= =?us-ascii?Q?iX8B1rIkB//K1UTaMWV2ObwrzA2vNLOTk8nxdTcR6LMhUdyUUaiCx8+8soyc?= =?us-ascii?Q?lbBQvXHzgDqZGqx7lBIGJPQO+sO850wF+ARg0kasY8sQLkF/RvvnvIrnhmU3?= =?us-ascii?Q?bgsbkfjJDk3yRJcBs1PB3cSwbK63Af5FoZgO/+IHDbTjpvPeQStTVtP+HNDj?= =?us-ascii?Q?xIntWrb8P1L5R9fV0D/qVW19Uv3siUlQ7M5xswZBUzgD6fpKuibYVuSXknSd?= =?us-ascii?Q?6XJMyhtVe4Y0Vshy9ZKkebQhuSLqYUoC5NaPRriWqBNYZ9dobHnY7GsJlohA?= =?us-ascii?Q?IjZ/cuCYswNzSWYk/E3SWA67ERjkUeW8QcrD3xcnQQ8v2L17208edNFVd2Oz?= =?us-ascii?Q?6A9XeLbkP08mJb+taF31UtEmWPLiK5JsAJlNH+qr6kQDTKiEZz4no9EXbqlr?= =?us-ascii?Q?3TXv2y8ZJ/ttEl52e7wus3BG0pF2JFoLmzVy32OOdGIwO4fQ4Uafew9DOdF6?= =?us-ascii?Q?LP8A/D7muQzfWZmiCQT6G8jHFDk7XkihoWZHmoJ9UB6gCm39YuSLizaEevIl?= =?us-ascii?Q?LfGvJ6bKCgZuqqDWRDjO/Ahba5aTwbOVmlXdZ5CAwpB7PvGj2kaboEcRINRi?= =?us-ascii?Q?8mwA6GizszlbcE1oPEnkeOERu8rLHqU07F1mHv+QL6XaPISWVJoaSDXcUOch?= =?us-ascii?Q?pFmP5FPPIUJi2whNJQ8hgDsUhfdI5Vh/0nnLBMtu2RVwnSExpAs6Jorthw3/?= =?us-ascii?Q?ZEUz0Y1gtna0FxuSWRjhDCa0154iOls/W66jeuvYmW3tFd6n+TMcCnsOv2uC?= =?us-ascii?Q?Fq6BLOdL1SyU6NgSMTRZEGlp/K9KMjcmJeoMorH6FR9eAWqJHGvjuN5BzT5+?= =?us-ascii?Q?zibwiTcPb3Rw1c8eWR1h4GKEzlUjozOH9+AmdBUB+E6O/x8cBWexdC1OWkhB?= =?us-ascii?Q?2NfKbdawOkUy4qLLSek=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: b93cda34-eaef-410e-6bf7-08db4ad1e8f6 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 May 2023 05:56:02.0080 (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: E+MfpofIfjB6fIvC47traZClGv9wmPi047oC77v9vsPYUQUMkq5RjnPcyUhCQR94wXDfC6kOaqo42wYCPZsVQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5680 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 -----Original Message----- From: Lin, MarsX =20 Sent: Tuesday, May 2, 2023 11:29 AM 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 BdsFv 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 | 9 ++- UefiPayloadPkg/UefiPayloadPkg.fdf | 9 ++- 7 files changed, 12 insertions(+), 93 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 62637ae6aa..31d1d29435 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 =20 /** Signal EndOfDxe event and install SMM Ready to lock protocol. @@ -296,56 +294,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 f9626175e2..b9387a4d36 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. @@ -47,11 +46,9 @@ HiiLib PrintLib PlatformHookLib - HobLib =20 [Guids] gEfiEndOfDxeEventGroupGuid - gEdkiiBootManagerMenuFileGuid =20 [Protocols] gEfiGenericMemTestProtocolGuid ## CONSUMES @@ -74,5 +71,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 a23a7b5a78..017d9fdb17 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 9847f189ff..a731cfaf4d 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -429,6 +429,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) @@ -474,7 +475,6 @@ !endif =20 [PcdsPatchableInModule.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F !if $(USE_CBMEM_FOR_CONSOLE) =3D=3D FALSE @@ -639,10 +639,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..df4898486b 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -60,6 +60,7 @@ FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } =20 +!if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE !if $(NETWORK_DRIVER_ENABLE) =3D=3D TRUE ##########################################################################= ###### [FV.NETWORKFV] @@ -112,6 +113,10 @@ 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 +163,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 +308,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.33.0.windows.2