[PATCH 1/1] ArmVirtPkg: Remove redundant library instances in ArmVirtQemuKernel.dsc

[PATCH 1/1] ArmVirtPkg: Remove redundant library instances in ArmVirtQemuKernel.dsc

[Fu Siyuan]

Commit 9a67ba261fe9 ("ArmVirtPkg: Replace obsoleted network drivers
from platform DSC/FDF") incorrectly added the BaseCryptLib, OpensslLib
and IntrinsicLib to "ArmVirtPkg/ArmVirtQemuKernel.dsc", it's redundant
and the library instances from "ArmVirt.dsc.inc" is already sufficient.

This patch also adjust the order of network drivers in "ArmVirtPkg/
ArmVirtQemuFvMain.fdf.inc" to make it same as the DSC file.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
---
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc     | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 3316f982695f..dc6a0a2bcdc7 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -126,9 +126,9 @@ [FV.FvMain]
   INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
   INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+  INF NetworkPkg/TcpDxe/TcpDxe.inf
   INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
   INF NetworkPkg/IScsiDxe/IScsiDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
 !if $(NETWORK_IP6_ENABLE) == TRUE
   INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
   INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 812c71e772ec..6c2d6488d499 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -67,9 +67,6 @@ [LibraryClasses.common]
 
 [LibraryClasses.common.UEFI_DRIVER]
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
 
 [BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]
   #
-- 
2.19.1.windows.1

Re: [PATCH 1/1] ArmVirtPkg: Remove redundant library instances in ArmVirtQemuKernel.dsc

[Laszlo Ersek]

On 12/17/18 02:34, Fu Siyuan wrote:
> Commit 9a67ba261fe9 ("ArmVirtPkg: Replace obsoleted network drivers
> from platform DSC/FDF") incorrectly added the BaseCryptLib, OpensslLib
> and IntrinsicLib to "ArmVirtPkg/ArmVirtQemuKernel.dsc", it's redundant
> and the library instances from "ArmVirt.dsc.inc" is already sufficient.
> 
> This patch also adjust the order of network drivers in "ArmVirtPkg/
> ArmVirtQemuFvMain.fdf.inc" to make it same as the DSC file.
> 
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +-
>  ArmVirtPkg/ArmVirtQemuKernel.dsc     | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index 3316f982695f..dc6a0a2bcdc7 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -126,9 +126,9 @@ [FV.FvMain]
>    INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
>    INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>    INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> +  INF NetworkPkg/TcpDxe/TcpDxe.inf
>    INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>    INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -  INF NetworkPkg/TcpDxe/TcpDxe.inf
>  !if $(NETWORK_IP6_ENABLE) == TRUE
>    INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
>    INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 812c71e772ec..6c2d6488d499 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -67,9 +67,6 @@ [LibraryClasses.common]
>  
>  [LibraryClasses.common.UEFI_DRIVER]
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> -  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> -  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> -  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>  
>  [BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]
>    #
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thank you for the quick update!
Laszlo