From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=nPsG/0SG; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.68, mailfrom: pete@akeo.ie) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by groups.io with SMTP; Fri, 07 Jun 2019 08:08:13 -0700 Received: by mail-ed1-f68.google.com with SMTP id k8so3465057edr.11 for ; Fri, 07 Jun 2019 08:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IebAG/P33pqQ+RZRAxXNxyiVhkIg6rO7Ha+86OI2l+M=; b=nPsG/0SG/iWS/TkhQseED5Y428uGArpd/DaKiPzeDPaQs0JtJ7eG3xF9NFHpvqjMkq UysAgRH9WE8Or2DJrhJKK47dVj9dlSBE7O9W47U5+iq7M80aY2WvTSx//Sf0f89DLyks gvy5WQyUVZjmSREiBoYXnTViXzR4e2jqAKTe/6ia15Fe/QdkO2+G9KArH0jE5npxa87p DIegEB9pMnEUxUTIyJPSGD72jIKiNOlw/BN4NudP/G41JX49TIRLxK5QSi/mtp0G/+G5 tzOTpV5ZsGfMYizgz8hz5zT53WwsLfrEJ67tqXUmg0DFNCc6aDAHUm4gvX4o9PPNSLaY CAow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IebAG/P33pqQ+RZRAxXNxyiVhkIg6rO7Ha+86OI2l+M=; b=pRzwAz9b/G+vGMgdH9JuaUPZsIZ3YqmdKvdr+dFySD1aEKwk16Yq0H6TfNh4uCMKr5 GWqCF+6podBD1BmKt2xYMNGfR3Wu0DUmxHUft5GAEbOVoP/NTbwzvM0z7XGz0g0KHVcn MkrgX3yyd5sNTRsMsIiXCzpJsqFmIEdaZqlcplDj0/6P4jPlpojdFyRnCUT/tXvebLdu t1YYNXJllHmFwDO5GoJuuMKoKV8g+veU0lM56ViXJbAg7MBxmfvvqfYdHjPsasMhHyh6 5/xP4RI1K9dIoHxfqq6QzaziFQLvnvr61VNl+Oqq9xIpGhaLwTT90pvmU679VdsPZSbI S4BA== X-Gm-Message-State: APjAAAXt4PrDsww/+ALZRG49xYbEjAMu/4vfdPAq5PcPTrKRXYYzAnCY nplB21dh6pXVtTpYkUYTartCuxYYDrcRig== X-Google-Smtp-Source: APXvYqxLToYSLSwOn0+XTLqU/XPVtEKddsBZ42IHJuSAHsa8qGAEOc01/8Y3ru96x4xiTMSXZhAeaQ== X-Received: by 2002:a17:906:1942:: with SMTP id b2mr46348502eje.272.1559920091092; Fri, 07 Jun 2019 08:08:11 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.79.95]) by smtp.gmail.com with ESMTPSA id 17sm591623edu.21.2019.06.07.08.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 08:08:10 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org Subject: [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Fri, 7 Jun 2019 16:07:51 +0100 Message-Id: <20190607150751.11840-3-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190607150751.11840-1-pete@akeo.ie> References: <20190607150751.11840-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. Signed-off-by: Pete Batard --- Platform/RaspberryPi/RPi3/RPi3.dsc | 31 ++++++++------------ Platform/RaspberryPi/RPi3/RPi3.fdf | 11 +------ 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 85b954b060f1..fe883eac96ba 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -25,6 +25,12 @@ [Defines] SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/RaspberryPi/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf + # + # Network definition + # + DEFINE NETWORK_TLS_ENABLE = FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE + # # Defines for default states. These can be changed on the command line. # -D FLAG=VALUE @@ -85,12 +91,6 @@ [LibraryClasses.common] # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - # # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions. # This library provides the instrinsic functions such a compiler may generate calls to. @@ -117,6 +117,11 @@ [LibraryClasses.common] PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf + # Cryptographic libraries + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + # # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window # in the debugger will show load and unload commands for symbols. You can cut and paste this @@ -140,11 +145,8 @@ [LibraryClasses.common] # Secure Boot dependencies # !if $(SECURE_BOOT_ENABLE) == TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -588,16 +590,7 @@ [Components.common] # # Networking stack # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf +!include NetworkPkg/Network.dsc.inc # # RNG diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf index 6be7c23af467..c7c3f7a2ab8c 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.fdf +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf @@ -265,16 +265,7 @@ [FV.FvMain] # # 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/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/Udp4Dxe/Udp4Dxe.inf - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/TcpDxe/TcpDxe.inf +!include NetworkPkg/Network.fdf.inc # # RNG -- 2.21.0.windows.1