SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.dsc

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index d15294eb7205b6f0f5b0c217b72702ecb4970831..d0b0b0e1beb101499c27899682264742961c2bca 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -1,7 +1,7 @@
 ## @file\r
 #  EFI/Framework Open Virtual Machine Firmware (OVMF) platform\r
 #\r
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2017, 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
@@ -38,6 +38,7 @@
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SMM_REQUIRE             = FALSE\r
+  DEFINE TLS_ENABLE              = FALSE\r
 \r
 [BuildOptions]\r
   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
@@ -147,25 +148,34 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
 \r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
+!if $(TLS_ENABLE) == TRUE\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+!else\r
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
+!endif\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
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
-!endif\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
+!if $(NETWORK_IP6_ENABLE) == TRUE\r
+  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
+!endif\r
+\r
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
 !endif\r
 \r
+!if $(TLS_ENABLE) == TRUE\r
+  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
+!endif\r
+\r
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
@@ -435,13 +445,15 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
+!endif\r
+\r
 !ifndef $(USE_OLD_SHELL)\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
 !endif\r
 \r
 !if $(SMM_REQUIRE) == TRUE\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
 !endif\r
 \r
@@ -496,6 +508,11 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000\r
 \r
+!if $(SMM_REQUIRE) == TRUE\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000\r
+!endif\r
+\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform.\r
@@ -704,11 +721,7 @@
   NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
   NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
   NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
 !else\r
   MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
@@ -719,6 +732,10 @@
   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
+  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
 !endif\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r