NetworkPkg: Add NETWORK_HTTP_ENABLE macro

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 3b0f04967a4b244b495c79ee95c69f4db7d2bcc8..f447c62f68989c5585b019bbb4fc29f0afb5a428 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
+#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -38,6 +38,7 @@
   DEFINE NETWORK_SNP_ENABLE              = FALSE\r
   DEFINE NETWORK_TLS_ENABLE              = FALSE\r
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE\r
+  DEFINE NETWORK_ISCSI_ENABLE            = TRUE\r
 \r
 !if $(NETWORK_SNP_ENABLE) == TRUE\r
   !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
@@ -56,6 +57,8 @@
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
   QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf\r
+  QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf\r
+  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf\r
 \r
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf\r
 \r
@@ -73,6 +76,7 @@
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
@@ -80,14 +84,14 @@
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
-[BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]\r
+[BuildOptions]\r
+!include NetworkPkg/NetworkBuildOptions.dsc.inc\r
+\r
   #\r
-  # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists\r
-  # on emitting GOT based symbol references when running in shared mode, unless\r
-  # we override visibility to 'hidden' in all modules that make up the PrePi\r
-  # build.\r
+  # We need to avoid jump tables in SEC modules, so that the PE/COFF\r
+  # self-relocation code itself is guaranteed to be position independent.\r
   #\r
-  GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h\r
+  GCC:*_*_*_CC_FLAGS = -fno-jump-tables\r
 \r
 ################################################################################\r
 #\r
@@ -172,6 +176,12 @@
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3\r
 \r
 [PcdsPatchableInModule.common]\r
+  # we need to provide a resolution for this PCD that supports PcdSet64()\r
+  # being called from ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c,\r
+  # even though that call will be compiled out on this platform as it does\r
+  # not (and cannot) support the TPM2 driver stack\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
+\r
   #\r
   # This will be overridden in the code\r
   #\r
@@ -231,6 +241,12 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0\r
   gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE\r
 \r
+  #\r
+  # IPv4 and IPv6 PXE Boot support.\r
+  #\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01\r
+\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform\r
@@ -355,11 +371,18 @@
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
   }\r
+  OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf\r
 \r
   #\r
   # Networking stack\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
+  }\r
+\r
 !if $(NETWORK_TLS_ENABLE) == TRUE\r
   NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
     <LibraryClasses>\r
@@ -373,6 +396,11 @@
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 \r
+  #\r
+  # NVME Driver\r
+  #\r
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
+\r
   #\r
   # SMBIOS Support\r
   #\r