## @file\r
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform\r
#\r
-# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
##\r
\r
# -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
\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
# one of the supported values, in place of any of the convenience macros, is\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
!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
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+ ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
!else\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\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
PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf\r
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\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
+ # Network Pcds\r
+ #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
\r
!endif\r
\r
# IRQs 5, 9, 10, 11 are level-triggered\r
- gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20\r
+ gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20\r
\r
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf\r
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
}\r
\r
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
- PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
+ OvmfPkg/8259InterruptControllerDxe/8259.inf\r
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
UefiCpuPkg/CpuDxe/CpuDxe.inf\r
- PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+ OvmfPkg/8254TimerDxe/8254Timer.inf\r
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
#\r
# ISA Support\r
#\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
- IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf\r
+ OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+ MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
+ MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\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
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf\r
!endif\r
\r
OvmfPkg/PlatformDxe/Platform.inf\r