[PATCH v2] UefiPayloadPkg: Add macro to support selective driver in UPL


Lu, James
 

From: James Lu <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, AtaAtapiPassThruDxe
- SD_ENABLE: SdMmcPciDxe, EmmcDxe, SdDxe
- PS2_MOUSE_ENABLE: Ps2MouseDxe

Cc: Guo Dong <guo.dong@...>
Cc: Ray Ni <ray.ni@...>
Cc: Gua Guo <gua.guo@...>
Signed-off-by: James Lu <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..25443139a6 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -36,7 +36,16 @@
DEFINE PLATFORM_BOOT_TIMEOUT =3D 3=0D
DEFINE ABOVE_4G_MEMORY =3D TRUE=0D
DEFINE BOOT_MANAGER_ESCAPE =3D FALSE=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
+ #=0D
+ # NULL: NullMemoryTestDxe=0D
+ # GENERIC: GenericMemoryTestDxe=0D
+ #=0D
+ DEFINE MEMORY_TEST =3D NULL=0D
#=0D
# SBL: UEFI payload for Slim Bootloader=0D
# COREBOOT: UEFI payload for coreboot=0D
@@ -596,7 +605,11 @@
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun=
timeDxe.inf=0D
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf=0D
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf=0D
+!if $(MEMORY_TEST) =3D=3D "GENERIC"=0D
+ MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTest=
Dxe.inf=0D
+!elseif $(MEMORY_TEST) =3D=3D "NULL"=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 +644,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 +659,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 +688,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 +761,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
<PcdsFixedAtBuild>=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
<PcdsFixedAtBuild>=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..92afc13b9c 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -149,7 +149,11 @@ 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 $(MEMORY_TEST) =3D=3D "GENERIC"=0D
+INF MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryT=
estDxe.inf=0D
+!elseif $(MEMORY_TEST) =3D=3D "NULL"=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 +180,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 +201,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 +217,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 +251,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


Sheng Lean Tan
 

Reviewed-by: Lean Sheng Tan<sheng.tan@...>