Re: [PATCH v2 5/6] OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.

[Laszlo Ersek <lersek@redhat.com>]

Another comment for this patch:

On 11/22/18 06:21, Fu Siyuan wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> The feature enabling flags in [Defines] section have been updated to use
> the NetworkPkg's terms, and the value has been overridden with the original
> default value on this platform.
> 
> This patch also rename the TLS_ENABLE flag to PLATFORM_TLS_ENABLE for the
> platform specific configuration for TLS support.
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Julien Grall <julien.grall@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
> 
> Notes:
>     v2:
>     Rename TLS_ENABLE flag to PLATFORM_TLS_ENABLE flag for platform specific configuration for TLS support.
> 
>  OvmfPkg/OvmfPkgIa32.dsc    | 75 +++++++++----------
>  OvmfPkg/OvmfPkgIa32.fdf    | 27 +------
>  OvmfPkg/OvmfPkgIa32X64.dsc | 76 +++++++++-----------
>  OvmfPkg/OvmfPkgIa32X64.fdf | 27 +------
>  OvmfPkg/OvmfPkgX64.dsc     | 75 +++++++++----------
>  OvmfPkg/OvmfPkgX64.fdf     | 27 +------
>  6 files changed, 102 insertions(+), 205 deletions(-)

It catches my eye that the IA32X64 dsc file has a different "changed
line count" from the others (76 vs. 75). And, indeed, there is a bug:

> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> index f7f9ab06bb5a..995328992ccf 100644
> --- a/OvmfPkg/OvmfPkgIa32.fdf
> +++ b/OvmfPkg/OvmfPkgIa32.fdf

> @@ -509,10 +519,10 @@ [PcdsFixedAtBuild]
>    gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
>  !endif
>  
> -[PcdsFixedAtBuild.X64]
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> -  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> -!endif
> +  #
> +  # Network Pcds
> +  #
> +!include NetworkPkg/NetworkPcds.dsc.inc
>  
>    gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
>  

(5) Please do not remove the [PcdsFixedAtBuild.X64] section header.

Thanks,
Laszlo