# -D FLAG=VALUE\r
#\r
DEFINE SECURE_BOOT_ENABLE = FALSE\r
- DEFINE NETWORK_IP6_ENABLE = FALSE\r
- DEFINE HTTP_BOOT_ENABLE = FALSE\r
DEFINE SMM_REQUIRE = FALSE\r
- DEFINE TLS_ENABLE = FALSE\r
DEFINE TPM2_ENABLE = FALSE\r
DEFINE TPM2_CONFIG_ENABLE = FALSE\r
- DEFINE USE_LEGACY_ISA_STACK = FALSE\r
+\r
+ #\r
+ # Network definition\r
+ #\r
+ DEFINE NETWORK_TLS_ENABLE = FALSE\r
+ DEFINE NETWORK_IP6_ENABLE = FALSE\r
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE\r
+ DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
\r
#\r
# Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
\r
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
!else\r
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf\r
!else\r
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
!endif\r
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
\r
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+ #\r
+ # Network libraries\r
+ #\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
!endif\r
\r
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf\r
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf\r
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf\r
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
!else\r
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf\r
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
!endif\r
\r
[LibraryClasses.common]\r
!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
# match PcdFlashNvStorageVariableSize purely for convenience\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
!endif\r
!if $(FD_SIZE_IN_KB) == 4096\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
# match PcdFlashNvStorageVariableSize purely for convenience\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000\r
!endif\r
!endif\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
!endif\r
# the PCIEXBAR register.\r
#\r
# On Q35 machine types that QEMU intends to support in the long term, QEMU\r
- # never lets the RAM below 4 GB exceed 2 GB.\r
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000\r
+ # never lets the RAM below 4 GB exceed 2816 MB.\r
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000\r
\r
!ifdef $(SOURCE_DEBUG_ENABLE)\r
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
!endif\r
\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
-\r
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
+ #\r
+ # Network Pcds\r
+ #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Base|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base|0x0\r
+!ifdef $(CSM_ENABLE)\r
+ gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x0\r
+!else\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x800000000\r
+!endif\r
\r
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0\r
\r
<LibraryClasses>\r
!ifdef $(CSM_ENABLE)\r
NULL|OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
!endif\r
}\r
MdeModulePkg/Logo/LogoDxe.inf\r
NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
!ifdef $(CSM_ENABLE)\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
!endif\r
}\r
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
+!ifndef $(CSM_ENABLE)\r
OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+!endif\r
OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
\r
#\r
# ISA Support\r
#\r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
OvmfPkg/SioBusDxe/SioBusDxe.inf\r
MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
- PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
- IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
- IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
- IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
-!endif\r
\r
#\r
# SMBIOS Support\r
#\r
# Network Support\r
#\r
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
- NetworkPkg/TcpDxe/TcpDxe.inf\r
- NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- NetworkPkg/DnsDxe/DnsDxe.inf\r
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
- NetworkPkg/HttpDxe/HttpDxe.inf\r
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
- NetworkPkg/TlsDxe/TlsDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
<LibraryClasses>\r
NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
!ifdef $(CSM_ENABLE)\r
- IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
+ OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
<LibraryClasses>\r
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
}\r
- IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
+ OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r