BaseTools/Capsule: Do not support -o with --dump-info

[mirror_edk2.git] / NetworkPkg / NetworkPkg.dec

diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index de5dabea36180e3e03bb138729a90fc7ce4004ce..aae36226d5f285223b1ef1b8b86838fdf0dee29b 100644 (file)
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -3,8 +3,8 @@
 #\r
 # This package provides network modules that conform to UEFI 2.4 specification.\r
 #\r
-# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available under\r
 # the terms and conditions of the BSD License which accompanies this distribution.\r
@@ -20,7 +20,7 @@
   DEC_SPECIFICATION              = 0x00010005\r
   PACKAGE_NAME                   = NetworkPkg\r
   PACKAGE_GUID                   = 947988BE-8D5C-471a-893D-AD181C46BEBB\r
-  PACKAGE_VERSION                = 0.96\r
+  PACKAGE_VERSION                = 0.98\r
   PACKAGE_UNI_FILE               = NetworkPkg.uni\r
 \r
 [Includes]\r
@@ -37,6 +37,23 @@
   # Include/Guid/IscsiConfigHii.h\r
   gIScsiConfigGuid              = { 0x4b47d616, 0xa8d6, 0x4552, { 0x9d, 0x44, 0xcc, 0xad, 0x2e, 0xf, 0x4c, 0xf9}}\r
 \r
+  # Include/Guid/HttpBootConfigHii.h\r
+  gHttpBootConfigGuid           = { 0x4d20583a, 0x7765, 0x4e7a, { 0x8a, 0x67, 0xdc, 0xde, 0x74, 0xee, 0x3e, 0xc5 }}\r
+\r
+  # Include/Guid/TlsAuthConfigHii.h\r
+  gTlsAuthConfigGuid            = { 0xb0eae4f8, 0x9a04, 0x4c6d, { 0xa7, 0x48, 0x79, 0x3d, 0xaa, 0xf, 0x65, 0xdf }}\r
+\r
+  # Include/Guid/TlsAuthentication.h\r
+  gEfiTlsCaCertificateGuid      = { 0xfd2340D0, 0x3dab, 0x4349, { 0xa6, 0xc7, 0x3b, 0x4f, 0x12, 0xb4, 0x8e, 0xae }}\r
+\r
+  # Include/Guid/HttpTlsCipherList.h\r
+  gEdkiiHttpTlsCipherListGuid   = { 0x46ddb415, 0x5244, 0x49c7, { 0x93, 0x74, 0xf0, 0xe2, 0x98, 0xe7, 0xd3, 0x86 }}\r
+\r
+[PcdsFixedAtBuild]\r
+  ## The max attempt number will be created by iSCSI driver.\r
+  # @Prompt Max attempt number.\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdMaxIScsiAttemptNumber|0x08|UINT8|0x0000000D\r
+\r
 [PcdsFeatureFlag]\r
   ## Indicates if the IPsec IKEv2 Certificate Authentication feature is enabled or not.<BR><BR>\r
   #   TRUE  - Certificate Authentication feature is enabled.<BR>\r
@@ -69,6 +86,12 @@
   # @Prompt Private Key's size.\r
   gEfiNetworkPkgTokenSpaceGuid.PcdIpsecUefiCertificateKeySize|0x3d5|UINT32|0x00000006\r
 \r
+  ## Indicates whether HTTP connections (i.e., unsecured) are permitted or not.\r
+  # TRUE  - HTTP connections are allowed. Both the "https://" and "http://" URI schemes are permitted.\r
+  # FALSE - HTTP connections are denied. Only the "https://" URI scheme is permitted.\r
+  # @Prompt Indicates whether HTTP connections are permitted or not.\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|FALSE|BOOLEAN|0x00000008\r
+\r
 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]\r
   ## IPv6 DHCP Unique Identifier (DUID) Type configuration (From RFCs 3315 and 6355).\r
   # 01 = DUID Based on Link-layer Address Plus Time [DUID-LLT]\r
@@ -78,5 +101,18 @@
   # @Prompt Type Value of Dhcp6 Unique Identifier (DUID).\r
   gEfiNetworkPkgTokenSpaceGuid.PcdDhcp6UidType|4|UINT8|0x10000001\r
 \r
+  ## Network boot policy to stop UEFI iSCSI if applicable.\r
+  # 0x00 = Always use UEFI iSCSI and ignore iSCSI HBA.\r
+  # 0x01 = Stop UEFI iSCSI if iSCSI HBA adapter produces AIP protocol with Network Boot.\r
+  # 0x02 = Stop UEFI iSCSI if iSCSI HBA adapter supports booting from iSCSI IPv4 targets.\r
+  # 0x04 = Stop UEFI iSCSI if iSCSI HBA adapter supports booting from iSCSI IPv6 targets.\r
+  # 0x08 = Stop UEFI iSCSI if iSCSI HBA adapter supports an offload engine for iSCSI boot.\r
+  # 0x10 = Stop UEFI iSCSI if iSCSI HBA adapter supports multipath I/O for iSCSI boot.\r
+  # 0x20 = Stop UEFI iSCSI if iSCSI HBA adapter is currently configured to boot from iSCSI IPv4 targets.\r
+  # 0x40 = Stop UEFI iSCSI if iSCSI HBA adapter is currently configured to boot from iSCSI IPv6 targets.\r
+  # 0xFF = Always use iSCSI HBA and ignore UEFI iSCSI.\r
+  # @Prompt Type Value of network boot policy used in iSCSI.\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdIScsiAIPNetworkBootPolicy|0x08|UINT8|0x10000007\r
+\r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   NetworkPkgExtra.uni\r