[edk2,v3,5/5] ArmPlatformPkg: Add conditionalised networking support for RTSM A15

Message ID 1422696566-21807-6-git-send-email-fu.wei@linaro.org
State New
Headers show

Commit Message

Fu Wei Jan. 31, 2015, 9:29 a.m.
From: Fu Wei <fu.wei@linaro.org>

Delete original network protocol support files.
Those files have been integrated into ArmVExpress-networking.fdf.inc

Add support for including the SMSC LAN 91C111 driver support
and ArmVExpress-networking.fdf.inc by default(EDK2_ENABLE_SMSC_91X=1).
If specify "-D EDK2_ENABLE_SMSC_91X=0" build variable,
the networking support will be disabled.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 .../ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc         |  4 ++++
 .../ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf         | 21 +++++----------------
 2 files changed, 9 insertions(+), 16 deletions(-)

Patch

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 78f4077..1e84d20 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -27,6 +27,10 @@ 
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
 
+!ifndef EDK2_ENABLE_SMSC_91X
+  DEFINE EDK2_ENABLE_SMSC_91X=1
+!endif
+
 !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
 
 [LibraryClasses.common]
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index 547f8cf..a8aceac 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -129,22 +129,6 @@  READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
   #
-  # Networking stack
-  #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
-
-  #
   # Multiple Console IO support
   #
   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
@@ -187,6 +171,11 @@  READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
 
+!if $(EDK2_ENABLE_SMSC_91X) != 0
+!include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc
+  INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
+!endif
+
   #
   # UEFI application (Shell Embedded Boot Loader)
   #