* [Patch 1/6] NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-17 2:58 ` [Patch 2/6] MdeModulePkg: Remove network related guid definitions from MdeModulePkg.dec Liming Gao
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Siyuan Fu, Jiaxin Wu
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2196
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
{MdeModulePkg => NetworkPkg}/Include/Guid/Ip4Config2Hii.h | 0
{MdeModulePkg => NetworkPkg}/Include/Guid/Ip4IScsiConfigHii.h | 0
{MdeModulePkg => NetworkPkg}/Include/Guid/VlanConfigHii.h | 0
NetworkPkg/NetworkPkg.dec | 10 ++++++++++
4 files changed, 10 insertions(+)
diff --git a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h b/NetworkPkg/Include/Guid/Ip4Config2Hii.h
similarity index 100%
rename from MdeModulePkg/Include/Guid/Ip4Config2Hii.h
rename to NetworkPkg/Include/Guid/Ip4Config2Hii.h
diff --git a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h b/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h
similarity index 100%
rename from MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
rename to NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h
diff --git a/MdeModulePkg/Include/Guid/VlanConfigHii.h b/NetworkPkg/Include/Guid/VlanConfigHii.h
similarity index 100%
rename from MdeModulePkg/Include/Guid/VlanConfigHii.h
rename to NetworkPkg/Include/Guid/VlanConfigHii.h
diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index 2bdb3f5663..c39e7d692e 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -70,6 +70,16 @@
# Include/Guid/WifiConnectionManagerConfigHii.h
gWifiConfigGuid = { 0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83, 0x2e, 0x30, 0xd, 0x2c, 0xef }}
+ ## Include/Guid/Ip4Config2Hii.h
+ gIp4Config2NvDataGuid = { 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }}
+
+ ## Include/Guid/VlanConfigHii.h
+ gVlanConfigFormSetGuid = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }}
+
+ ## Include/Guid/Ip4IScsiConfigHii.h
+ gIp4IScsiConfigGuid = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }}
+ gIScsiCHAPAuthInfoGuid = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }}
+
[Protocols]
## Include/Protocol/Dpc.h
gEfiDpcProtocolGuid = {0x480f8ae9, 0xc46, 0x4aa9, { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Patch 2/6] MdeModulePkg: Remove network related guid definitions from MdeModulePkg.dec
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
2019-09-17 2:58 ` [Patch 1/6] NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-17 3:02 ` [edk2-devel] " Wu, Hao A
2019-09-17 2:58 ` [Patch 3/6] NetworkPkg: Add PcdTftpBlockSize in NetworkPkg.dec Liming Gao
` (4 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2196
Network related guid definitions have been moved into NetworkPkg.dec.
So, they can be removed from MdeModulePkg.dec.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 17beb45235..a680641fe7 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -295,16 +295,6 @@
## Include/Guid/PlatDriOverrideHii.h
gPlatformOverridesManagerGuid = { 0x8614567d, 0x35be, 0x4415, { 0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0 }}
- ## Include/Guid/Ip4Config2Hii.h
- gIp4Config2NvDataGuid = { 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }}
-
- ## Include/Guid/VlanConfigHii.h
- gVlanConfigFormSetGuid = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }}
-
- ## Include/Guid/Ip4IScsiConfigHii.h
- gIp4IScsiConfigGuid = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }}
- gIScsiCHAPAuthInfoGuid = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }}
-
## Include/Guid/ZeroGuid.h
gZeroGuid = { 0x0, 0x0, 0x0, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [edk2-devel] [Patch 2/6] MdeModulePkg: Remove network related guid definitions from MdeModulePkg.dec
2019-09-17 2:58 ` [Patch 2/6] MdeModulePkg: Remove network related guid definitions from MdeModulePkg.dec Liming Gao
@ 2019-09-17 3:02 ` Wu, Hao A
0 siblings, 0 replies; 10+ messages in thread
From: Wu, Hao A @ 2019-09-17 3:02 UTC (permalink / raw)
To: devel@edk2.groups.io, Gao, Liming; +Cc: Wang, Jian J
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Liming Gao
> Sent: Tuesday, September 17, 2019 10:59 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J; Wu, Hao A
> Subject: [edk2-devel] [Patch 2/6] MdeModulePkg: Remove network related
> guid definitions from MdeModulePkg.dec
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2196
> Network related guid definitions have been moved into NetworkPkg.dec.
> So, they can be removed from MdeModulePkg.dec.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
> MdeModulePkg/MdeModulePkg.dec | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/MdeModulePkg/MdeModulePkg.dec
> b/MdeModulePkg/MdeModulePkg.dec
> index 17beb45235..a680641fe7 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -295,16 +295,6 @@
> ## Include/Guid/PlatDriOverrideHii.h
> gPlatformOverridesManagerGuid = { 0x8614567d, 0x35be, 0x4415, { 0x8d,
> 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0 }}
>
> - ## Include/Guid/Ip4Config2Hii.h
> - gIp4Config2NvDataGuid = { 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36,
> 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }}
> -
> - ## Include/Guid/VlanConfigHii.h
> - gVlanConfigFormSetGuid = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97,
> 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }}
> -
> - ## Include/Guid/Ip4IScsiConfigHii.h
> - gIp4IScsiConfigGuid = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26,
> 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }}
> - gIScsiCHAPAuthInfoGuid = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37,
> 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }}
> -
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
> ## Include/Guid/ZeroGuid.h
> gZeroGuid = { 0x0, 0x0, 0x0, {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
> 0x0}}
>
> --
> 2.13.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Patch 3/6] NetworkPkg: Add PcdTftpBlockSize in NetworkPkg.dec
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
2019-09-17 2:58 ` [Patch 1/6] NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg Liming Gao
2019-09-17 2:58 ` [Patch 2/6] MdeModulePkg: Remove network related guid definitions from MdeModulePkg.dec Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-17 2:58 ` [Patch 4/6] NetworkPkg UefiPxeBcDxe: Consume PcdTftpBlockSize defined " Liming Gao
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Siyuan Fu, Jiaxin Wu
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2195
PcdTftpBlockSize is network related PCD. It should be defined in NetworkPkg.dec.
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
NetworkPkg/NetworkPkg.dec | 7 +++++++
NetworkPkg/NetworkPkg.uni | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index c39e7d692e..944b1d1501 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -102,6 +102,13 @@
# @Prompt PXE TFTP windowsize.
gEfiNetworkPkgTokenSpaceGuid.PcdPxeTftpWindowSize|0x4|UINT64|0x10000008
+
+ ## This setting can override the default TFTP block size. A value of 0 computes
+ # the default from MTU information. A non-zero value will be used as block size
+ # in bytes.
+ # @Prompt TFTP block size.
+ gEfiNetworkPkgTokenSpaceGuid.PcdTftpBlockSize|0x0|UINT64|0x1000000B
+
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## IPv6 DHCP Unique Identifier (DUID) Type configuration (From RFCs 3315 and 6355).
# 01 = DUID Based on Link-layer Address Plus Time [DUID-LLT]
diff --git a/NetworkPkg/NetworkPkg.uni b/NetworkPkg/NetworkPkg.uni
index ab9b4d21d3..19e57a4a60 100644
--- a/NetworkPkg/NetworkPkg.uni
+++ b/NetworkPkg/NetworkPkg.uni
@@ -92,3 +92,9 @@
#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdIPv6PXESupport_HELP #language en-US "Indicates IPV6 PXE Function is enabled or not.\n"
"A value of 0 indicates the IPV6 PXE Function is disabled.\n"
"A value of 1 indicates the IPV6 PXE Function is enabled."
+
+#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdTftpBlockSize_PROMPT #language en-US "TFTP block size"
+
+#string STR_gEfiNetworkPkgTokenSpaceGuid_PcdTftpBlockSize_HELP #language en-US "This setting can override the default TFTP block size. A value of 0 computes "
+ "the default from MTU information. A non-zero value will be used as block size "
+ "in bytes."
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Patch 4/6] NetworkPkg UefiPxeBcDxe: Consume PcdTftpBlockSize defined in NetworkPkg.dec
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
` (2 preceding siblings ...)
2019-09-17 2:58 ` [Patch 3/6] NetworkPkg: Add PcdTftpBlockSize in NetworkPkg.dec Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-17 2:58 ` [Patch 5/6] MdeModulePkg: Remove PCD gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize Liming Gao
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Siyuan Fu, Jiaxin Wu
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2195
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 0341f1052a..9ac18a13c4 100644
--- a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -100,7 +100,7 @@
gEfiAdapterInfoUndiIpv6SupportGuid ## SOMETIMES_CONSUMES ## GUID
[Pcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CONSUMES
+ gEfiNetworkPkgTokenSpaceGuid.PcdTftpBlockSize ## SOMETIMES_CONSUMES
gEfiNetworkPkgTokenSpaceGuid.PcdPxeTftpWindowSize ## SOMETIMES_CONSUMES
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport ## CONSUMES
gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport ## CONSUMES
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Patch 5/6] MdeModulePkg: Remove PCD gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
` (3 preceding siblings ...)
2019-09-17 2:58 ` [Patch 4/6] NetworkPkg UefiPxeBcDxe: Consume PcdTftpBlockSize defined " Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-27 0:35 ` Wu, Hao A
2019-09-17 2:58 ` [Patch 6/6] NetworkPkg: Remove unnecessary MdeModulePkg/MdeModulePkg.dec dependency in INF Liming Gao
2019-09-17 3:15 ` [edk2-devel] [Patch 0/6] Clean up NetworkPkg Siyuan, Fu
6 siblings, 1 reply; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2195
This PCD has been moved to NetworkPkg.dec file.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 6 ------
MdeModulePkg/MdeModulePkg.uni | 6 ------
2 files changed, 12 deletions(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index a680641fe7..856b4b7080 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1177,12 +1177,6 @@
# @Expression 0x80000002 | (gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl & 0xD8) == 0
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x07|UINT8|0x00020005
- ## This setting can override the default TFTP block size. A value of 0 computes
- # the default from MTU information. A non-zero value will be used as block size
- # in bytes.
- # @Prompt TFTP block size.
- gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize|0x0|UINT64|0x30001026
-
## Maximum address that the DXE Core will allocate the EFI_SYSTEM_TABLE_POINTER
# structure. The default value for this PCD is 0, which means that the DXE Core
# will allocate the buffer from the EFI_SYSTEM_TABLE_POINTER structure on a 4MB
diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni
index b4e8142199..a2c7a7ded3 100644
--- a/MdeModulePkg/MdeModulePkg.uni
+++ b/MdeModulePkg/MdeModulePkg.uni
@@ -204,12 +204,6 @@
"BIT7..BIT6 - Reserved. Must be 0.<BR>\n"
"Default is to enable and clear all FIFOs.<BR>"
-#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdTftpBlockSize_PROMPT #language en-US "TFTP block size"
-
-#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdTftpBlockSize_HELP #language en-US "This setting can override the default TFTP block size. A value of 0 computes "
- "the default from MTU information. A non-zero value will be used as block size "
- "in bytes."
-
#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdMaxEfiSystemTablePointerAddress_PROMPT #language en-US "Maximum Efi System Table Pointer address"
#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdMaxEfiSystemTablePointerAddress_HELP #language en-US "Maximum address that the DXE Core will allocate the EFI_SYSTEM_TABLE_POINTER structure. The default value for this PCD is 0, which means that the DXE Core will allocate the buffer from the EFI_SYSTEM_TABLE_POINTER structure on a 4MB boundary as close to the top of memory as feasible. If this PCD is set to a value other than 0, then the DXE Core will first attempt to allocate the EFI_SYSTEM_TABLE_POINTER structure on a 4MB boundary below the address specified by this PCD, and if that allocation fails, retry the allocation on a 4MB boundary as close to the top of memory as feasible."
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Patch 5/6] MdeModulePkg: Remove PCD gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize
2019-09-17 2:58 ` [Patch 5/6] MdeModulePkg: Remove PCD gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize Liming Gao
@ 2019-09-27 0:35 ` Wu, Hao A
0 siblings, 0 replies; 10+ messages in thread
From: Wu, Hao A @ 2019-09-27 0:35 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io; +Cc: Wang, Jian J
> -----Original Message-----
> From: Gao, Liming
> Sent: Tuesday, September 17, 2019 10:59 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J; Wu, Hao A
> Subject: [Patch 5/6] MdeModulePkg: Remove PCD
> gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize
>
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2195
> This PCD has been moved to NetworkPkg.dec file.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
> MdeModulePkg/MdeModulePkg.dec | 6 ------
> MdeModulePkg/MdeModulePkg.uni | 6 ------
> 2 files changed, 12 deletions(-)
>
> diff --git a/MdeModulePkg/MdeModulePkg.dec
> b/MdeModulePkg/MdeModulePkg.dec
> index a680641fe7..856b4b7080 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -1177,12 +1177,6 @@
> # @Expression 0x80000002 |
> (gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl & 0xD8) == 0
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|0x07|UINT8|0x00
> 020005
>
> - ## This setting can override the default TFTP block size. A value of 0
> computes
> - # the default from MTU information. A non-zero value will be used as block
> size
> - # in bytes.
> - # @Prompt TFTP block size.
> -
> gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize|0x0|UINT64|0x30001
> 026
> -
> ## Maximum address that the DXE Core will allocate the
> EFI_SYSTEM_TABLE_POINTER
> # structure. The default value for this PCD is 0, which means that the DXE
> Core
> # will allocate the buffer from the EFI_SYSTEM_TABLE_POINTER structure
> on a 4MB
> diff --git a/MdeModulePkg/MdeModulePkg.uni
> b/MdeModulePkg/MdeModulePkg.uni
> index b4e8142199..a2c7a7ded3 100644
> --- a/MdeModulePkg/MdeModulePkg.uni
> +++ b/MdeModulePkg/MdeModulePkg.uni
> @@ -204,12 +204,6 @@
> "BIT7..BIT6 - Reserved. Must be
> 0.<BR>\n"
> "Default is to enable and clear all
> FIFOs.<BR>"
>
> -#string
> STR_gEfiMdeModulePkgTokenSpaceGuid_PcdTftpBlockSize_PROMPT
> #language en-US "TFTP block size"
> -
> -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdTftpBlockSize_HELP
> #language en-US "This setting can override the default TFTP block size. A
> value of 0 computes "
> - "the default from MTU information.
> A non-zero value will be used as block size "
> - "in bytes."
> -
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
> #string
> STR_gEfiMdeModulePkgTokenSpaceGuid_PcdMaxEfiSystemTablePointerAd
> dress_PROMPT #language en-US "Maximum Efi System Table Pointer
> address"
>
> #string
> STR_gEfiMdeModulePkgTokenSpaceGuid_PcdMaxEfiSystemTablePointerAd
> dress_HELP #language en-US "Maximum address that the DXE Core will
> allocate the EFI_SYSTEM_TABLE_POINTER structure. The default value for
> this PCD is 0, which means that the DXE Core will allocate the buffer from the
> EFI_SYSTEM_TABLE_POINTER structure on a 4MB boundary as close to the
> top of memory as feasible. If this PCD is set to a value other than 0, then the
> DXE Core will first attempt to allocate the EFI_SYSTEM_TABLE_POINTER
> structure on a 4MB boundary below the address specified by this PCD, and if
> that allocation fails, retry the allocation on a 4MB boundary as close to the
> top of memory as feasible."
> --
> 2.13.0.windows.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Patch 6/6] NetworkPkg: Remove unnecessary MdeModulePkg/MdeModulePkg.dec dependency in INF
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
` (4 preceding siblings ...)
2019-09-17 2:58 ` [Patch 5/6] MdeModulePkg: Remove PCD gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize Liming Gao
@ 2019-09-17 2:58 ` Liming Gao
2019-09-17 3:15 ` [edk2-devel] [Patch 0/6] Clean up NetworkPkg Siyuan, Fu
6 siblings, 0 replies; 10+ messages in thread
From: Liming Gao @ 2019-09-17 2:58 UTC (permalink / raw)
To: devel; +Cc: Siyuan Fu, Jiaxin Wu
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
NetworkPkg/ArpDxe/ArpDxe.inf | 1 -
NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf | 1 -
NetworkPkg/DnsDxe/DnsDxe.inf | 1 -
NetworkPkg/HttpDxe/HttpDxe.inf | 1 -
NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 1 -
NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf | 1 -
NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf | 1 -
NetworkPkg/Library/DxeNetLib/DxeNetLib.inf | 1 -
NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf | 1 -
NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf | 1 -
NetworkPkg/MnpDxe/MnpDxe.inf | 1 -
NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf | 1 -
NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf | 1 -
NetworkPkg/SnpDxe/SnpDxe.inf | 1 -
NetworkPkg/TcpDxe/TcpDxe.inf | 1 -
NetworkPkg/TlsDxe/TlsDxe.inf | 1 -
NetworkPkg/Udp4Dxe/Udp4Dxe.inf | 1 -
NetworkPkg/Udp6Dxe/Udp6Dxe.inf | 1 -
NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 1 -
19 files changed, 19 deletions(-)
diff --git a/NetworkPkg/ArpDxe/ArpDxe.inf b/NetworkPkg/ArpDxe/ArpDxe.inf
index 2ff74895a6..fa2006f3ea 100644
--- a/NetworkPkg/ArpDxe/ArpDxe.inf
+++ b/NetworkPkg/ArpDxe/ArpDxe.inf
@@ -41,7 +41,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
index e34aab0a6b..ffad0dee33 100644
--- a/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -43,7 +43,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/DnsDxe/DnsDxe.inf b/NetworkPkg/DnsDxe/DnsDxe.inf
index 3a66bdd13a..4f074b62bb 100644
--- a/NetworkPkg/DnsDxe/DnsDxe.inf
+++ b/NetworkPkg/DnsDxe/DnsDxe.inf
@@ -20,7 +20,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[Sources]
diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf b/NetworkPkg/HttpDxe/HttpDxe.inf
index 4bc80b332e..35fe31af18 100644
--- a/NetworkPkg/HttpDxe/HttpDxe.inf
+++ b/NetworkPkg/HttpDxe/HttpDxe.inf
@@ -20,7 +20,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[Sources]
diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
index e12c3cc922..3452ea97e9 100644
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
@@ -21,7 +21,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[Sources]
diff --git a/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
index 984a24ffd3..54df8897de 100644
--- a/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -29,7 +29,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[LibraryClasses]
diff --git a/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index bfd631a31d..952cbb12ae 100644
--- a/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -27,7 +27,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
index 40e855695b..8145d256ec 100644
--- a/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
@@ -30,7 +30,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
index 4dcf34429a..7d37c710cc 100644
--- a/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
@@ -27,7 +27,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 7614faa959..f43c7178e7 100644
--- a/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -27,7 +27,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/MnpDxe/MnpDxe.inf b/NetworkPkg/MnpDxe/MnpDxe.inf
index e399232415..7280060dde 100644
--- a/NetworkPkg/MnpDxe/MnpDxe.inf
+++ b/NetworkPkg/MnpDxe/MnpDxe.inf
@@ -43,7 +43,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[LibraryClasses]
diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
index 25cbdc185d..c15863c525 100644
--- a/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -45,7 +45,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf b/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
index 7a1af34f94..78a4f7701b 100644
--- a/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
+++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
@@ -46,7 +46,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/SnpDxe/SnpDxe.inf b/NetworkPkg/SnpDxe/SnpDxe.inf
index 9a37b12e53..afeb1526cc 100644
--- a/NetworkPkg/SnpDxe/SnpDxe.inf
+++ b/NetworkPkg/SnpDxe/SnpDxe.inf
@@ -52,7 +52,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/TcpDxe/TcpDxe.inf b/NetworkPkg/TcpDxe/TcpDxe.inf
index 4865acb0d7..c0acbdca57 100644
--- a/NetworkPkg/TcpDxe/TcpDxe.inf
+++ b/NetworkPkg/TcpDxe/TcpDxe.inf
@@ -51,7 +51,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
index f640461809..1c6c74853c 100644
--- a/NetworkPkg/TlsDxe/TlsDxe.inf
+++ b/NetworkPkg/TlsDxe/TlsDxe.inf
@@ -28,7 +28,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
CryptoPkg/CryptoPkg.dec
diff --git a/NetworkPkg/Udp4Dxe/Udp4Dxe.inf b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
index 6a71ed7019..0d306ce6b9 100644
--- a/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
+++ b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
@@ -40,7 +40,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
diff --git a/NetworkPkg/Udp6Dxe/Udp6Dxe.inf b/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
index 7830d2de26..d5458c72da 100644
--- a/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
+++ b/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
@@ -37,7 +37,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
[LibraryClasses]
diff --git a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 9ac18a13c4..3371c150be 100644
--- a/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -47,7 +47,6 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
--
2.13.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [edk2-devel] [Patch 0/6] Clean up NetworkPkg
2019-09-17 2:58 [Patch 0/6] Clean up NetworkPkg Liming Gao
` (5 preceding siblings ...)
2019-09-17 2:58 ` [Patch 6/6] NetworkPkg: Remove unnecessary MdeModulePkg/MdeModulePkg.dec dependency in INF Liming Gao
@ 2019-09-17 3:15 ` Siyuan, Fu
6 siblings, 0 replies; 10+ messages in thread
From: Siyuan, Fu @ 2019-09-17 3:15 UTC (permalink / raw)
To: devel@edk2.groups.io, Gao, Liming; +Cc: Wu, Jiaxin, Wang, Jian J, Wu, Hao A
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Liming
> Gao
> Sent: 2019年9月17日 10:59
> To: devel@edk2.groups.io
> Cc: Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
> Subject: [edk2-devel] [Patch 0/6] Clean up NetworkPkg
>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
>
> Liming Gao (6):
> NetworkPkg: Move network related header files from MdeModulePkg to
> NetworkPkg
> MdeModulePkg: Remove network related guid definitions from
> MdeModulePkg.dec
> NetworkPkg: Add PcdTftpBlockSize in NetworkPkg.dec
> NetworkPkg UefiPxeBcDxe: Consume PcdTftpBlockSize defined in
> NetworkPkg.dec
> MdeModulePkg: Remove PCD
> gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize
> NetworkPkg: Remove unnecessary MdeModulePkg/MdeModulePkg.dec
> dependency in INF
>
> MdeModulePkg/MdeModulePkg.dec | 16 ----------------
> MdeModulePkg/MdeModulePkg.uni | 6 ------
> NetworkPkg/ArpDxe/ArpDxe.inf | 1 -
> NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf | 1 -
> NetworkPkg/DnsDxe/DnsDxe.inf | 1 -
> NetworkPkg/HttpDxe/HttpDxe.inf | 1 -
> NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 1 -
> {MdeModulePkg => NetworkPkg}/Include/Guid/Ip4Config2Hii.h | 0
> {MdeModulePkg => NetworkPkg}/Include/Guid/Ip4IScsiConfigHii.h | 0
> {MdeModulePkg => NetworkPkg}/Include/Guid/VlanConfigHii.h | 0
> NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf | 1 -
> NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf | 1 -
> NetworkPkg/Library/DxeNetLib/DxeNetLib.inf | 1 -
> NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf | 1 -
> NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf | 1 -
> NetworkPkg/MnpDxe/MnpDxe.inf | 1 -
> NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf | 1 -
> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf | 1 -
> NetworkPkg/NetworkPkg.dec | 17 +++++++++++++++++
> NetworkPkg/NetworkPkg.uni | 6 ++++++
> NetworkPkg/SnpDxe/SnpDxe.inf | 1 -
> NetworkPkg/TcpDxe/TcpDxe.inf | 1 -
> NetworkPkg/TlsDxe/TlsDxe.inf | 1 -
> NetworkPkg/Udp4Dxe/Udp4Dxe.inf | 1 -
> NetworkPkg/Udp6Dxe/Udp6Dxe.inf | 1 -
> NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf | 3 +--
> 26 files changed, 24 insertions(+), 42 deletions(-)
> rename {MdeModulePkg => NetworkPkg}/Include/Guid/Ip4Config2Hii.h
> (100%)
> rename {MdeModulePkg => NetworkPkg}/Include/Guid/Ip4IScsiConfigHii.h
> (100%)
> rename {MdeModulePkg => NetworkPkg}/Include/Guid/VlanConfigHii.h
> (100%)
>
> --
> 2.13.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread