From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.3350.1657863669761130044 for ; Thu, 14 Jul 2022 22:41:09 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=MFS2XxrM; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: james.lu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657863669; x=1689399669; h=from:to:cc:subject:date:message-id:references: in-reply-to:mime-version; bh=LyVGCW+Ea0XxmgXAaJZnyMEPEnzIbClBygO6deW5MBQ=; b=MFS2XxrMQbdeDCl3qtu1IFduqw2sw9Ow/XRfe5cjBNwRaI6KEPQVTKNY pJ844p6JZ5GJyqaNTASUQaQe6/Ccqi1Mls3dWOkkyAdf0DStGOUvjiqay vQAm0pX4fcOGlfK3oFi95UBHqoe2tWSUBxz0DswV2OymDjM78ZKYk1cnq kiiseS57dxzXN3Hen8Mgk2oHO9/uq5sLrwpp0L63xZzy1x6AbQhII6kuA 8Q77kBdtVCp/NIuPxzfCIjcG/mcaYZPT+U0BeZbMv2kGOcvL8JCj5tlYF 6ZaZkuRJYN1mB7uu+AdWXRiLS+whhrQtE+AegPSHxe/O2SVDcre2dcB5p A==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="372021548" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208,217";a="372021548" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 22:41:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208,217";a="738539279" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga001.fm.intel.com with ESMTP; 14 Jul 2022 22:41:09 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 14 Jul 2022 22:41:09 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) 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.2308.27; Thu, 14 Jul 2022 22:41:08 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 14 Jul 2022 22:41:08 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.176) 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.2308.27; Thu, 14 Jul 2022 22:41:08 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FIVlSTeDRlRNGCy1y+n8Qt9UoC/WVbVz+YNGcOSrWj30I9hVQZNxPOte3nDSbWp5YokibZ15mZJut3KfHx5M93jO6+Il7ekxh03QZyiSxJY4K+A37yqisfUL0wJ419e4fmhrk4opuDk/bje4Qf/meqsD+5zguEgjbAEU9miAUHKlEzWXlzTYtxhhL86IzgmDFUv8+c3wr+TRX2nhYOkr+bHnSyrfPLaQVey4vFFuW76vTt42GI6iH77155+3r7/BRRsp3g7dI7tnyBGfHs4mDDSD+Q5RGCjR1eP9vbAEESViQuF21dBP09kkVRBESMOQj1CLABR2Apblzsr2jchSVw== 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=YME8wA9vtvkhZb34yYOV70Zr774/D/X9WLhFPVdCVyc=; b=gmdF0h3JktbltFSlpld9X51XwJ6VP2tloIKSHeua0ObUMoWt9Edjr+YiueLVbJN3zyGxWKm4W0jjQFrYGu96NHtapv5hcrsvzqSwF6riYxrxluIuojprTLXO0sbILQIVopBG17w780xPFvMSvp44qea1ZKJ92ryqx7HTdRpz0kM4F94Io7ivtis5MLmRRPTGGDhnyrgIzHCBxLaTJfe2GWVZUnp8Z5nk/XDoVspLdkaAYfNLpiNXi7vZhWPShRTpBq4O8LU0mQWjdsJv/GHgJ04D5CKSwRqiYca+jL00spfTisljpDBI92k9J31yZgA2M65EPBxkrIfb+K6s6P0WnQ== 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 BN6PR11MB1908.namprd11.prod.outlook.com (2603:10b6:404:103::13) by DS7PR11MB6222.namprd11.prod.outlook.com (2603:10b6:8:99::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Fri, 15 Jul 2022 05:41:06 +0000 Received: from BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::d980:aec4:5d03:4373]) by BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::d980:aec4:5d03:4373%7]) with mapi id 15.20.5438.013; Fri, 15 Jul 2022 05:41:06 +0000 From: "Lu, James" To: "Ni, Ray" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Guo, Gua" Subject: Re: [PATCH v3] UefiPayloadPkg: Add macro to support selective driver in UPL Thread-Topic: [PATCH v3] UefiPayloadPkg: Add macro to support selective driver in UPL Thread-Index: AQHYkhzP4lm+YQZs6UuNFgMaDnGQR61zHh2AgAvYZ+A= Date: Fri, 15 Jul 2022 05:41:05 +0000 Message-ID: References: <20220707161509.1471-1-james.lu@intel.com> In-Reply-To: Accept-Language: en-001, en-US, zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.500.17 dlp-product: dlpe-windows authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f3aa7cec-93d7-4f5c-aa6f-08da66249cad x-ms-traffictypediagnostic: DS7PR11MB6222:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6wiqdW6MOP50YM7ZYAnhLrAhL1ttQqvC5i4SK+XHCfZ9iJnA8lf3E2+AdY3/56Cmpm/SOq6e6SGStXAQzDYNCrTitg7+d4eVOzsiXm+3OWN2zhlKu4zjilGyOK3QjKDI1GunHGR9Z5GETMEp/cSLPYU40XxkFPs00CEJgOG13un8oRsiSogWFyufXsZAuGGytokXw8+tjFH50YEhtfgAZ4GS87HaSr6na05F4LZLhEaPkGM9Sjy9BKEHr9mfqMH/ckQggZiPzkB9gMV7Kc6nkXxG8HZv18mVOzYsvVkTXar/K1wDjmalVPbzzJnQKYbrQe4Ym4wVNFHwSZ8/Jxw+GwdLOGdJPsjx9fV2zqVSXWCiRcCNfiswJqDsw7u05hoztwN4RD3/R0dSnItsCvIRD/0ae25pp6KqblhDmLpl3qlq2wB78NGcRsj8tSWkzH2B4C8eRhS24lJOPStKfgtbk0a1vNEJfRZCSt2RF+DLUcKO0xDH+5CwuB45K87HG+2OSx3+GSTSnLqSQs1mwEdjfO5aqcjwYnpRSZEaBTNBebP7PJPRkwhFc4HUhYnps2BLv8X9YtKpncpwk83NI9E1ei0VAADNuULDNP6NXE/uC07DOWSjh+z/5DSzU6lNNSqy+4ADEz009pxOMdAezCLOV825JvRCKImmaq/OYNwLkFWCaDw480sWNQOcWJYNbdVS95v08d89+x4ELwJgqeee+nomOmrzQI/7MNBsBVoiyFEEaUlaQ/ymxcXpOaWkuZCfnBsu8uWsjyMZ3R4pca3SjrHt+4MXTXG69+fd+BWqA8fbFzIQhigR0WGCeR4Xl16LXltCDShASBZjpE4cybyenp2pFaRlm+V1Oy3FiO7vqJ3Jhlr9VLxUQiw9pYWx214I x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB1908.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(376002)(346002)(136003)(366004)(396003)(39860400002)(52536014)(64756008)(66446008)(66946007)(8936002)(166002)(5660300002)(66476007)(66556008)(41300700001)(2906002)(71200400001)(76116006)(316002)(86362001)(478600001)(7696005)(82960400001)(38070700005)(54906003)(53546011)(107886003)(55016003)(6506007)(186003)(9686003)(33656002)(4326008)(122000001)(26005)(110136005)(38100700002)(8676002)(966005)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?BBixVCYOTMlDb7qFwXEDoCQ5p0rPLw3wsA3ovQXGIJadV4EQ8o1VweO8v/Ly?= =?us-ascii?Q?NURRqpyHeNX7TFDiD1F/drl8YEpQJN4nxvMhiDzIPtt4n7OU1LswglYAvkIa?= =?us-ascii?Q?povtonQXq3MK7FmcKwr0YqSU4ivIIW9rpN8CX2B4098DvY3wnwIeqlBKy77t?= =?us-ascii?Q?6xy4pRuvREOn3dZxAAOIdww68XXQ9oiI+YxJA5rgCXWJ2VVLoLIfs2/lEmZ4?= =?us-ascii?Q?UStLZczZsQyBQzX1oZBgNtuLhVMrtu6aO6I3khio1+UjnCfrzbzrf94O1rmO?= =?us-ascii?Q?nBNOIBB2gbAA0R04bubaccJlzqpw4jlz2xBneURWVdcryPkNcoZA/LqhinEx?= =?us-ascii?Q?RuNCtOi+WdXI9zpyaLl2cC2ZdIP4vS6kffE8csCLOCT8KSOaIvY8sRKMBW96?= =?us-ascii?Q?l6JjEwa+0Ftl/U8qpFYPaw8kJa4GDmkLY/xV9EUgWHuExhhbhXF03jMVYwEP?= =?us-ascii?Q?//ag3NZsHBn+Vy8dsMqAffhMd67P2OaPrvtGJqqx1zl4hpcar6E1jRRqOewW?= =?us-ascii?Q?YzDFWfSIQayf18Lv7dp4k71y540e13qNJ0TiVomlaTTw6iRNUFZJO8eIXmaI?= =?us-ascii?Q?ygs4o2dIK8CfPQR9WF6eahsvzlkao44qhYF7TN1MOcDF8Umoi6g4rw7J88Ss?= =?us-ascii?Q?LsIbnyjpDElF/VlNFUr+C7WOs+KQo/6Zwe6BOOr6/B1newyzIbldiWv2A7fA?= =?us-ascii?Q?RTMUBwAiu0tKDihRTrceYCYwX5w/uArJGreUyCe1ytGOqZkvqY7FEX3poeCW?= =?us-ascii?Q?k71qqzUSqhaNH2ijy5hB5MVyAZkp2ClLu0IW6iVkec/Or4Xx+FFjnfgMe8AH?= =?us-ascii?Q?HOpXU1XRStm1TSxYzD2r0ZPx+R55eFAHcLxA+Cy2Ia6W83uRWB8rKPeWIbhI?= =?us-ascii?Q?p+upxtZgZBeoAqXoy+Ey++u/8uAEZiXh2Nkkq821BkMxLH69y67MO5LO0vWO?= =?us-ascii?Q?FiyRt2WkwYFLxWXYIOxh8fP6wlZM3sUT1kpXF5fRj0bvzgOnBuGc9U1rGDJx?= =?us-ascii?Q?DIVPWMlFOUuAw2dQS8sDk74U7Lv8km+ueZA//fwtKLOWQfA7S1vzApF/p8se?= =?us-ascii?Q?pPEVW4I4tqoMz/qKOIZeZ063mvsdkEG6v3PWsz97dMHUw5aOGLLvFzTBDIhO?= =?us-ascii?Q?nm273FvpmaG0RogchQtOzrO8JNF1j7P0FU0NfaNYQIhGMoDloChaKGsTEotn?= =?us-ascii?Q?QRS615YFdTlaF/sgvTY/2D22UbmR+wQSF4mALAIYK4B3i72xUTuCA+LB4hhX?= =?us-ascii?Q?Xgekk2g9pTbk7mSFBVvRwb0a7wwfH/INo3uLtV2aVjlHV8T9/zHdmd9AGQUF?= =?us-ascii?Q?diVBwVOdUW1th1x3fhmdfwF5pwdlMpBymymZu4/T9YHcpon/4+cftbuNpF1m?= =?us-ascii?Q?s3FxPa3JaRxJzIpWcDVLZrKQ0dhGsa6xs6n0ZIstLCIACersFLPbIgVBwEWI?= =?us-ascii?Q?H1YN8E8WFxy2GdeNkXFfK5tSWecnxeh+znOPoCQn6KOSeV/IJDY62pf2vYcA?= =?us-ascii?Q?KN6VA6YhpZD1B0cI1TiDTirbloLOp3X/CwCcI2d2jhLM6BOy2AdnZu+a7Jka?= =?us-ascii?Q?ODKQKH0d6lt+NLnKU10BnVmA1eOof0oJU5UkOii0?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB1908.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3aa7cec-93d7-4f5c-aa6f-08da66249cad X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2022 05:41:05.9673 (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: P4sJkg7TsIrPwDKAAWeAhzHIm0kfAut6cwhUjw9IsVZwUu7yURc3Y6m23c+DsZHqdrYnjH3uY+nIhKDvnTYSHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6222 Return-Path: james.lu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BN6PR11MB1908C9EED7166FE9180D0472888B9BN6PR11MB1908namp_" --_000_BN6PR11MB1908C9EED7166FE9180D0472888B9BN6PR11MB1908namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Created PR, please help to push UefiPayloadPkg: Add macro to support selective driver in UPL by jameslu8 * = Pull Request #3065 * tianocore/edk2 (github.com) Thanks, James From: Ni, Ray Sent: Friday, July 8, 2022 12:47 AM To: Lu, James ; devel@edk2.groups.io Cc: Lu, James ; Dong, Guo ; Guo, Gu= a Subject: Re: [PATCH v3] UefiPayloadPkg: Add macro to support selective driv= er in UPL Reviewed-by: Ray Ni > thanks, ray ________________________________ From: Lu, James > Sent: Friday, July 8, 2022 12:15:09 AM To: devel@edk2.groups.io > Cc: Lu, James >; Dong, Guo >; Ni, Ray >; Guo, Gua > Subject: [PATCH v3] UefiPayloadPkg: Add macro to support selective driver i= n UPL From: James Lu > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3967 Add macros to decide modules built into UPL.elf. Macro list: - GENERIC_MEMORY_TEST_ENABLE: GenericMemoryTestDxe - MEMORY_TEST: NullMemoryTestDxe or GenericMemoryDxe - ATA_ENABLE: SataControllerDxe, AtaBusDxe - SD_ENABLE: SdMmcPciDxe, EmmcDxe, SdDxe - PS2_MOUSE_ENABLE: Ps2MouseDxe Cc: Guo Dong > Cc: Ray Ni > Cc: Gua Guo > Signed-off-by: James Lu > --- UefiPayloadPkg/UefiPayloadPkg.dsc | 21 ++++++++++++++++++++ UefiPayloadPkg/UefiPayloadPkg.fdf | 14 ++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index cfcf38578d..ec79914f45 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -36,7 +36,16 @@ DEFINE PLATFORM_BOOT_TIMEOUT =3D 3 DEFINE ABOVE_4G_MEMORY =3D TRUE DEFINE BOOT_MANAGER_ESCAPE =3D FALSE + DEFINE ATA_ENABLE =3D TRUE + DEFINE SD_ENABLE =3D TRUE + DEFINE PS2_MOUSE_ENABLE =3D TRUE DEFINE SD_MMC_TIMEOUT =3D 1000000 + + # + # NULL: NullMemoryTestDxe + # GENERIC: GenericMemoryTestDxe + # + DEFINE MEMORY_TEST =3D NULL # # SBL: UEFI payload for Slim Bootloader # COREBOOT: UEFI payload for coreboot @@ -596,7 +605,11 @@ MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +!if $(MEMORY_TEST) =3D=3D "GENERIC" + MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTest= Dxe.inf +!elseif $(MEMORY_TEST) =3D=3D "NULL" MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f +!endif MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -631,8 +644,10 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf +!if $(ATA_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +!endif MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf @@ -644,9 +659,11 @@ # # SD/eMMC Support # +!if $(SD_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +!endif # # Usb Support @@ -671,7 +688,9 @@ !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +!endif # # Console Support @@ -742,12 +761,14 @@ # This should be FALSE for compiling the dynamic command. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { ## This flag is used to control initialization of the shell library # This should be FALSE for compiling the dynamic command. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!endif ShellPkg/Application/Shell/Shell.inf { ## This flag is used to control initialization of the shell library diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index c7b04978ad..35f79be2f0 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -149,7 +149,11 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRea= lTimeClockRuntimeDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf +!if $(MEMORY_TEST) =3D=3D "GENERIC" +INF MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryT= estDxe.inf +!elseif $(MEMORY_TEST) =3D=3D "NULL" +INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf +!endif INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf @@ -176,7 +180,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf +!endif # # Console Support @@ -195,8 +201,10 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe= .inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf +!if $(ATA_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +!endif INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf @@ -209,9 +217,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf # # SD/eMMC Support # +!if $(SD_ENABLE) =3D=3D TRUE INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf +!endif # # Usb Support @@ -241,7 +251,9 @@ INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable= Dxe.inf # !if $(SHELL_TYPE) =3D=3D BUILD_SHELL INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf +!endif INF ShellPkg/Application/Shell/Shell.inf !endif -- 2.26.2.windows.1 --_000_BN6PR11MB1908C9EED7166FE9180D0472888B9BN6PR11MB1908namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Created PR, please help to push

UefiPayloadPkg: Add macro to support selective driver in UPL by jameslu= 8 · Pull Request #3065 · tianocore/edk2 (github.com)=

 

 

Thanks,

James

 

From: Ni, Ray <ray.ni@intel.com>
Sent: Friday, July 8, 2022 12:47 AM
To: Lu, James <james.lu@intel.com>; devel@edk2.groups.io
Cc: Lu, James <james.lu@intel.com>; Dong, Guo <guo.dong@int= el.com>; Guo, Gua <gua.guo@intel.com>
Subject: Re: [PATCH v3] UefiPayloadPkg: Add macro to support selecti= ve driver in UPL

 

Reviewed-by: Ray Ni <Ray.ni@intel.com>

 

thanks,

ray

From: Lu, James <james.lu@intel.com>
Sent: Friday, July 8, 2022 12:15:09 AM
To: devel@edk2.groups.io= <devel@edk2.groups.io> Cc: Lu, James <james.lu@int= el.com>; Dong, Guo <guo.don= g@intel.com>; Ni, Ray <ray.ni= @intel.com>; Guo, Gua <gua.g= uo@intel.com>
Subject: [PATCH v3] UefiPayloadPkg: Add macro to support selective d= river in UPL

 

From: James Lu <james.lu@intel.com>

REF: http= s://bugzilla.tianocore.org/show_bug.cgi?id=3D3967

Add macros to decide modules built into UPL.elf.

Macro list:
 - GENERIC_MEMORY_TEST_ENABLE: GenericMemoryTestDxe
 - MEMORY_TEST: NullMemoryTestDxe or GenericMemoryDxe
 - ATA_ENABLE: SataControllerDxe, AtaBusDxe
 - SD_ENABLE: SdMmcPciDxe, EmmcDxe, SdDxe
 - PS2_MOUSE_ENABLE: Ps2MouseDxe

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>=
Cc: Gua Guo <gua.guo@intel.com&= gt;
Signed-off-by: James Lu <james.lu@= intel.com>
---
 UefiPayloadPkg/UefiPayloadPkg.dsc | 21 ++++++++++++++++++++
 UefiPayloadPkg/UefiPayloadPkg.fdf | 14 ++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc
index cfcf38578d..ec79914f45 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -36,7 +36,16 @@
   DEFINE PLATFORM_BOOT_TIMEOUT     &nbs= p;  =3D 3

   DEFINE ABOVE_4G_MEMORY      &nbs= p;       =3D TRUE

   DEFINE BOOT_MANAGER_ESCAPE      =     =3D FALSE

+  DEFINE ATA_ENABLE        &n= bsp;          =3D TRUE

+  DEFINE SD_ENABLE        &nb= sp;           =3D TRUE
+  DEFINE PS2_MOUSE_ENABLE       &n= bsp;     =3D TRUE

   DEFINE SD_MMC_TIMEOUT       = ;        =3D 1000000

+

+  #

+  # NULL:    NullMemoryTestDxe

+  # GENERIC: GenericMemoryTestDxe

+  #

+  DEFINE MEMORY_TEST        &= nbsp;         =3D NULL

   #

   # SBL:      UEFI payload for Slim Boo= tloader

   # COREBOOT: UEFI payload for coreboot

@@ -596,7 +605,11 @@
   MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCode= HandlerRuntimeDxe.inf

   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+!if $(MEMORY_TEST) =3D=3D "GENERIC"

+  MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemor= yTestDxe.inf

+!elseif $(MEMORY_TEST) =3D=3D "NULL"

   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemory= TestDxe.inf

+!endif

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
@@ -631,8 +644,10 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/Englis= hDxe.inf

   FatPkg/EnhancedFatDxe/Fat.inf

+!if $(ATA_ENABLE) =3D=3D TRUE

   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

+!endif

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

@@ -644,9 +659,11 @@
   #

   # SD/eMMC Support

   #

+!if $(SD_ENABLE) =3D=3D TRUE

   MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf

   MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf

   MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf

+!endif

 

   #

   # Usb Support

@@ -671,7 +688,9 @@
 !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE

   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf

 !endif

+!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE

   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf

+!endif

 

   #

   # Console Support

@@ -742,12 +761,14 @@
       #  This should be FALSE for compi= ling the dynamic command.

       gEfiShellPkgTokenSpaceGuid.PcdShellLib= AutoInitialize|FALSE

   }

+!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE

   ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf = {

     <PcdsFixedAtBuild>

       ## This flag is used to control initia= lization of the shell library

       #  This should be FALSE for compi= ling the dynamic command.

       gEfiShellPkgTokenSpaceGuid.PcdShellLib= AutoInitialize|FALSE

   }

+!endif

   ShellPkg/Application/Shell/Shell.inf {

     <PcdsFixedAtBuild>

       ## This flag is used to control initia= lization of the shell library

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf
index c7b04978ad..35f79be2f0 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -149,7 +149,11 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRea= lTimeClockRuntimeDxe.inf
 

 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

 INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf

+!if $(MEMORY_TEST) =3D=3D "GENERIC"

+INF  MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMe= moryTestDxe.inf

+!elseif $(MEMORY_TEST) =3D=3D "NULL"

+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTe= stDxe.inf

+!endif

 INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

 INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

@@ -176,7 +180,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf
 !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE

 INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf

 !endif

+!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE

 INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf

+!endif

 

 #

 # Console Support

@@ -195,8 +201,10 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe= .inf
 INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

 INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

 INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDx= e.inf

+!if $(ATA_ENABLE) =3D=3D TRUE

 INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf

 INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

+!endif

 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

@@ -209,9 +217,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #

 # SD/eMMC Support

 #

+!if $(SD_ENABLE) =3D=3D TRUE

 INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf

 INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf

 INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf

+!endif

 

 #

 # Usb Support

@@ -241,7 +251,9 @@ INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/Acpi= TableDxe.inf
 #

 !if $(SHELL_TYPE) =3D=3D BUILD_SHELL

 INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=

+!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE

 INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf

+!endif

 INF ShellPkg/Application/Shell/Shell.inf

 !endif

 

--
2.26.2.windows.1

--_000_BN6PR11MB1908C9EED7166FE9180D0472888B9BN6PR11MB1908namp_--