[Linaro-uefi] [PATCH v3 3/5] ArmPlatformPkg: Add the conditionalised networking support for FVP AArch64. It is enabled by default (EDK2_ENABLE_SMSC_91X=1). If specify "-D EDK2_ENABLE_SMSC_91X=0" build variable, the networking support will be disabled.

From: Leif Lindholm leif.lindholm@linaro.org

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm leif.lindholm@linaro.org [submitting patch upstream] Signed-off-by: Fu Wei fu.wei@linaro.org --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 +++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | 5 +++++ 2 files changed, 8 insertions(+)

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc index 7cc4e27..5547d27 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -31,6 +31,9 @@ DEFINE EDK2_SKIP_PEICORE=1 !endif

+!ifndef EDK2_ENABLE_SMSC_91X + DEFINE EDK2_ENABLE_SMSC_91X=1 +!endif

!include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf index 80acb95..c28d4ba 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -186,6 +186,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) #