Add Macro to enable or diable RamDiskDxe and SioBusDxe drivers.
Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
UefiPayloadPkg/UefiPayloadPkg.dsc | 10 ++++++++--
UefiPayloadPkg/UefiPayloadPkg.fdf | 7 +++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 9d7f311343..fb805dc772 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -28,6 +28,8 @@
DEFINE SOURCE_DEBUG_ENABLE = FALSE
DEFINE PS2_KEYBOARD_ENABLE = FALSE
+ DEFINE RAM_DISK_ENABLE = FALSE
+ DEFINE SIO_BUS_ENABLE = FALSE
DEFINE UNIVERSAL_PAYLOAD = FALSE
#
@@ -536,8 +538,10 @@
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
- MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+!if $(RAM_DISK_ENABLE) == TRUE
+ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+!endif
#
# SD/eMMC Support
#
@@ -562,8 +566,10 @@
!if $(SERIAL_DRIVER_ENABLE) == TRUE
MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
!endif
-!if $(PS2_KEYBOARD_ENABLE) == TRUE
+!if $(SIO_BUS_ENABLE) == TRUE
OvmfPkg/SioBusDxe/SioBusDxe.inf
+!endif
+!if $(PS2_KEYBOARD_ENABLE) == TRUE
MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
!endif
MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 6caa134081..6b48bfc869 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -142,8 +142,10 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
!if $(SERIAL_DRIVER_ENABLE) == TRUE
INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
!endif
-!if $(PS2_KEYBOARD_ENABLE) == TRUE
+!if $(SIO_BUS_ENABLE) == TRUE
INF OvmfPkg/SioBusDxe/SioBusDxe.inf
+!endif
+!if $(PS2_KEYBOARD_ENABLE) == TRUE
INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
!endif
INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@@ -171,8 +173,9 @@ INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!if $(RAM_DISK_ENABLE) == TRUE
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
-
+!endif
INF FatPkg/EnhancedFatDxe/Fat.inf
#
--
2.32.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80851): https://edk2.groups.io/g/devel/message/80851
Mute This Topic: https://groups.io/mt/85694975/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Ray Ni <ray.ni@intel.com> -----Original Message----- From: Liu, Zhiguang <zhiguang.liu@intel.com> Sent: Saturday, September 18, 2021 3:49 PM To: devel@edk2.groups.io Cc: Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Ma, Maurice <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com> Subject: [PATCH] UefiPayloadPkg: Add Macro to enable or diable some drivers. Add Macro to enable or diable RamDiskDxe and SioBusDxe drivers. Cc: Guo Dong <guo.dong@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Maurice Ma <maurice.ma@intel.com> Cc: Benjamin You <benjamin.you@intel.com> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com> --- UefiPayloadPkg/UefiPayloadPkg.dsc | 10 ++++++++-- UefiPayloadPkg/UefiPayloadPkg.fdf | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 9d7f311343..fb805dc772 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -28,6 +28,8 @@ DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE PS2_KEYBOARD_ENABLE = FALSE + DEFINE RAM_DISK_ENABLE = FALSE + DEFINE SIO_BUS_ENABLE = FALSE DEFINE UNIVERSAL_PAYLOAD = FALSE # @@ -536,8 +538,10 @@ MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf +!if $(RAM_DISK_ENABLE) == TRUE + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf +!endif # # SD/eMMC Support # @@ -562,8 +566,10 @@ !if $(SERIAL_DRIVER_ENABLE) == TRUE MdeModulePkg/Universal/SerialDxe/SerialDxe.inf !endif -!if $(PS2_KEYBOARD_ENABLE) == TRUE +!if $(SIO_BUS_ENABLE) == TRUE OvmfPkg/SioBusDxe/SioBusDxe.inf +!endif +!if $(PS2_KEYBOARD_ENABLE) == TRUE MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 6caa134081..6b48bfc869 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -142,8 +142,10 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf !if $(SERIAL_DRIVER_ENABLE) == TRUE INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf !endif -!if $(PS2_KEYBOARD_ENABLE) == TRUE +!if $(SIO_BUS_ENABLE) == TRUE INF OvmfPkg/SioBusDxe/SioBusDxe.inf +!endif +!if $(PS2_KEYBOARD_ENABLE) == TRUE INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif INF MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf @@ -171,8 +173,9 @@ INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf +!if $(RAM_DISK_ENABLE) == TRUE INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf - +!endif INF FatPkg/EnhancedFatDxe/Fat.inf # -- 2.32.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80853): https://edk2.groups.io/g/devel/message/80853 Mute This Topic: https://groups.io/mt/85694975/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Maurice Ma <maurice.ma@intel.com> > -----Original Message----- > From: Liu, Zhiguang <zhiguang.liu@intel.com> > Sent: Saturday, September 18, 2021 0:49 > To: devel@edk2.groups.io > Cc: Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Ma, > Maurice <maurice.ma@intel.com>; You, Benjamin > <benjamin.you@intel.com> > Subject: [PATCH] UefiPayloadPkg: Add Macro to enable or diable some > drivers. > > Add Macro to enable or diable RamDiskDxe and SioBusDxe drivers. > > Cc: Guo Dong <guo.dong@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Maurice Ma <maurice.ma@intel.com> > Cc: Benjamin You <benjamin.you@intel.com> > > Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com> > --- > UefiPayloadPkg/UefiPayloadPkg.dsc | 10 ++++++++-- > UefiPayloadPkg/UefiPayloadPkg.fdf | 7 +++++-- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > index 9d7f311343..fb805dc772 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -28,6 +28,8 @@ > DEFINE SOURCE_DEBUG_ENABLE = FALSE DEFINE > PS2_KEYBOARD_ENABLE = FALSE+ DEFINE RAM_DISK_ENABLE = > FALSE+ DEFINE SIO_BUS_ENABLE = FALSE DEFINE > UNIVERSAL_PAYLOAD = FALSE #@@ -536,8 +538,10 @@ > MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf- > MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf +!if > $(RAM_DISK_ENABLE) == TRUE+ > MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf+!endif # # > SD/eMMC Support #@@ -562,8 +566,10 @@ > !if $(SERIAL_DRIVER_ENABLE) == TRUE > MdeModulePkg/Universal/SerialDxe/SerialDxe.inf !endif-!if > $(PS2_KEYBOARD_ENABLE) == TRUE+!if $(SIO_BUS_ENABLE) == TRUE > OvmfPkg/SioBusDxe/SioBusDxe.inf+!endif+!if $(PS2_KEYBOARD_ENABLE) > == TRUE > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif > MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.infdiff --git > a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf > index 6caa134081..6b48bfc869 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -142,8 +142,10 @@ INF > MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf > !if $(SERIAL_DRIVER_ENABLE) == TRUE INF > MdeModulePkg/Universal/SerialDxe/SerialDxe.inf !endif-!if > $(PS2_KEYBOARD_ENABLE) == TRUE+!if $(SIO_BUS_ENABLE) == TRUE INF > OvmfPkg/SioBusDxe/SioBusDxe.inf+!endif+!if $(PS2_KEYBOARD_ENABLE) > == TRUE INF > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf !endif INF > MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf@@ -171,8 +173,9 > @@ INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf > INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf INF > MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf+!if > $(RAM_DISK_ENABLE) == TRUE INF > MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf-+!endif INF > FatPkg/EnhancedFatDxe/Fat.inf #-- > 2.32.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80875): https://edk2.groups.io/g/devel/message/80875 Mute This Topic: https://groups.io/mt/85694975/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.