From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, alan@softiron.co.uk,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms 06/11] Platform/AMD/OverdriveBoard: drop DO_XGBE C preprocessor defines
Date: Tue, 11 Dec 2018 19:35:09 +0100 [thread overview]
Message-ID: <20181211183514.20948-7-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org>
Now that all code relies on the PCD rather than the DO_XGBE macro,
get rid of it.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ++-------
Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 2 --
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 3b680e22cd36..fb524cfc5490 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -17,7 +17,6 @@
################################################################################
[Defines]
-DEFINE DO_XGBE = 1
DEFINE NUM_CORES = 8
DEFINE DO_KCS = 1
DEFINE DO_FLASHER = FALSE
@@ -272,8 +271,8 @@ DEFINE DO_CAPSULE = FALSE
*_*_*_ASLPP_FLAGS = $(ARCHCC_FLAGS)
*_*_*_ASLCC_FLAGS = $(ARCHCC_FLAGS)
- GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS)
- GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS)
+ GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS)
+ GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS)
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
@@ -465,7 +464,6 @@ DEFINE DO_CAPSULE = FALSE
gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
-!if $(DO_XGBE)
gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable|TRUE
gAmdModulePkgTokenSpaceGuid.PcdPort0PhyMode|0
@@ -480,7 +478,6 @@ DEFINE DO_CAPSULE = FALSE
[PcdsPatchableInModule]
gAmdModulePkgTokenSpaceGuid.PcdXgbeUseMacFromIscp|TRUE
gAmdModulePkgTokenSpaceGuid.PcdXgbeRev|2
-!endif
[PcdsPatchableInModule]
# PCIe Configuration: x4x4
@@ -654,13 +651,11 @@ DEFINE DO_CAPSULE = FALSE
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-!if $(DO_XGBE)
#
# SNP support
#
Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf
Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf
-!endif
#
# Networking stack
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index b5c03034a44a..31b9e18d3c29 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -181,13 +181,11 @@ READ_LOCK_STATUS = TRUE
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-!if $(DO_XGBE)
#
# SNP support
#
INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort0.inf
INF Silicon/AMD/Styx/AmdModulePkg/SnpDxe/SnpDxePort1.inf
-!endif
#
# Networking stack
--
2.19.2
next prev parent reply other threads:[~2018-12-11 18:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 18:35 [PATCH edk2-platforms 00/11] final set of Styx cleanups Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 01/11] Silicon/AMD/Styx/Iort: drop conditionally included XGBE nodes Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 02/11] Platform/SoftIron/Overdrive1000Board: remove dead XGBE references Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 03/11] Silicon/AMD/Styx/AcpiPlatformDxe: replace XGBE CPP conditional with PCD Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 04/11] Silicon/AMD/Styx/PlatInitPei: " Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 05/11] Silicon/AMD/Styx/StyxDtbLoaderLib: " Ard Biesheuvel
2018-12-11 18:35 ` Ard Biesheuvel [this message]
2018-12-11 18:35 ` [PATCH edk2-platforms 07/11] Silicon/AMD/Styx: introduce boolean PCD for KCS/IPMI support Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 08/11] Silicon/AMD/Styx/AcpiPlatformDxe: move IPMI/KCS device into separate SSDT Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 09/11] Silicon/AMD/Styx/StyxDtbLoaderLib: replace DO_KCS macro reference with PCD Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 10/11] Platform/Styx: get rid of DO_KCS preprocessor macro Ard Biesheuvel
2018-12-11 18:35 ` [PATCH edk2-platforms 11/11] Silicon/AMD/Styx/AcpiPlatformDxe: disable KCS on pre-B1 silicon Ard Biesheuvel
2018-12-12 22:23 ` [PATCH edk2-platforms 00/11] final set of Styx cleanups Leif Lindholm
2018-12-13 11:09 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181211183514.20948-7-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox