From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web09.53658.1656412509333357044 for ; Tue, 28 Jun 2022 03:35:09 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=NnlrNNjL; spf=pass (domain: intel.com, ip: 192.55.52.120, 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=1656412509; x=1687948509; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=CCQx5cWlQtNeim30hXgBFSpeGNV3rN6aIystf9GlkQc=; b=NnlrNNjLjOkAanMT7bg6IK1V0UJGZourxlYwdUe+tvRqF4QOubaBf48r /BrFEBORoXUln26FCf1kdoMnCTGdfLvQ3siYFueDxqVHtxNmKxunn50jx 2CeJ4XVlTHMS4tK1UtmmLMKKucWec2ebyk9HzjUorWsd5EEoxJwZtyhYJ spmizBPAHQC/tzai2rPNJEstMXqs/RfW3Aryh2xAun75hqGxkoY9I1E23 5ttQi4GcC0HpYEbtEVd2ZPeTj6k2IZQ+c3q7MzJ9hQCCkX8LPMq2S9Ga+ Cl2Oa/CaHXxs2WVsnch7BUV0yIX19D/bcRCZa3eSCdFlslEupSfKrCL7D Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10391"; a="280464974" X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="280464974" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2022 03:35:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="594746502" Received: from gguo-desk.gar.corp.intel.com ([10.5.215.23]) by fmsmga007.fm.intel.com with ESMTP; 28 Jun 2022 03:35:07 -0700 From: james.lu@intel.com To: devel@edk2.groups.io Cc: James Lu , Guo Dong , Ray Ni , Gua Guo Subject: [PATCH] UefiPayloadPkg: Add macro to support selective driver in UPL Date: Tue, 28 Jun 2022 18:35:02 +0800 Message-Id: <38b574266fdeaa275743eab94caf39acfe71b2bc.1656412190.git.james.lu@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 - NULL_MEMORY_TEST_ENABLE: NullMemoryTestDxe - ATA_ENABLE: SataControllerDxe, AtaBusDxe, AtaAtapiPassThruDxe - 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 | 18 ++++++++++++++++++ UefiPayloadPkg/UefiPayloadPkg.fdf | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index cfcf38578d..9e94a40d72 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -36,6 +36,11 @@ DEFINE PLATFORM_BOOT_TIMEOUT =3D 3=0D DEFINE ABOVE_4G_MEMORY =3D TRUE=0D DEFINE BOOT_MANAGER_ESCAPE =3D FALSE=0D + DEFINE GENERIC_MEMORY_TEST_ENABLE =3D FALSE=0D + DEFINE NULL_MEMORY_TEST_ENABLE =3D TRUE=0D + DEFINE ATA_ENABLE =3D TRUE=0D + DEFINE SD_ENABLE =3D TRUE=0D + DEFINE PS2_MOUSE_ENABLE =3D TRUE=0D DEFINE SD_MMC_TIMEOUT =3D 1000000=0D #=0D # SBL: UEFI payload for Slim Bootloader=0D @@ -596,7 +601,12 @@ MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf=0D UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf=0D MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf=0D +!if $(GENERIC_MEMORY_TEST_ENABLE) =3D=3D TRUE=0D + MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTest= Dxe.inf=0D +!endif=0D +!if $(NULL_MEMORY_TEST_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.in= f=0D +!endif=0D MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf=0D MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf=0D @@ -631,9 +641,11 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf=0D MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf=0D FatPkg/EnhancedFatDxe/Fat.inf=0D +!if $(ATA_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf=0D MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf=0D MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf=0D +!endif=0D MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf=0D MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf=0D MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf=0D @@ -644,9 +656,11 @@ #=0D # SD/eMMC Support=0D #=0D +!if $(SD_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf=0D MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf=0D MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf=0D +!endif=0D =0D #=0D # Usb Support=0D @@ -671,7 +685,9 @@ !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D !endif=0D +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE=0D MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf=0D +!endif=0D =0D #=0D # Console Support=0D @@ -742,12 +758,14 @@ # This should be FALSE for compiling the dynamic command.=0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE=0D ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {=0D =0D ## This flag is used to control initialization of the shell library= =0D # This should be FALSE for compiling the dynamic command.=0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D +!endif=0D ShellPkg/Application/Shell/Shell.inf {=0D =0D ## This flag is used to control initialization of the shell library= =0D diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index c7b04978ad..5aa228e828 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -149,7 +149,12 @@ INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRea= lTimeClockRuntimeDxe.inf =0D INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf=0D INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf=0D -INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.= inf=0D +!if $(GENERIC_MEMORY_TEST_ENABLE) =3D=3D TRUE=0D +INF MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryT= estDxe.inf=0D +!endif=0D +!if $(NULL_MEMORY_TEST_ENABLE) =3D=3D TRUE=0D +INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf=0D +!endif=0D INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf=0D INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf=0D INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf=0D @@ -176,7 +181,9 @@ INF OvmfPkg/SioBusDxe/SioBusDxe.inf !if $(PS2_KEYBOARD_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf=0D !endif=0D +!if $(PS2_MOUSE_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf=0D +!endif=0D =0D #=0D # Console Support=0D @@ -195,9 +202,11 @@ INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe= .inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf=0D INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf=0D INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf= =0D +!if $(ATA_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf=0D INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf=0D INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf=0D +!endif=0D INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf=0D INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf=0D INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf=0D @@ -209,9 +218,11 @@ INF FatPkg/EnhancedFatDxe/Fat.inf #=0D # SD/eMMC Support=0D #=0D +!if $(SD_ENABLE) =3D=3D TRUE=0D INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf=0D INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf=0D INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf=0D +!endif=0D =0D #=0D # Usb Support=0D @@ -241,7 +252,9 @@ INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTable= Dxe.inf #=0D !if $(SHELL_TYPE) =3D=3D BUILD_SHELL=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D +!if $(PERFORMANCE_MEASUREMENT_ENABLE) =3D=3D TRUE=0D INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf=0D +!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D !endif=0D =0D --=20 2.26.2.windows.1