CelloBoard will not support the AMD XGBE network interface, so we can drop all the references to it from the CelloBoard DSC and FDF files.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 26 ++------------------ Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 8 ------ 2 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index fcdffbd278b5..9c623f227815 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -18,7 +18,6 @@ [Defines]
DEFINE NUM_CORES = 8 -DEFINE DO_XGBE = 0 DEFINE DO_KCS = 0 DEFINE DO_RTK = 0
@@ -267,8 +266,8 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) *_*_*_ASLPP_FLAGS = -x c -E -P $(ARCHCC_FLAGS) *_*_*_ASLCC_FLAGS = -x c $(ARCHCC_FLAGS)
- GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DDO_RTK=$(DO_RTK) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 - GCC:*_*_AARCH64_PP_FLAGS = -DDO_XGBE=$(DO_XGBE) -DDO_KCS=$(DO_KCS) -DDO_RTK=$(DO_RTK) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 + GCC:*_*_AARCH64_ARCHCC_FLAGS = -DDO_KCS=$(DO_KCS) -DDO_RTK=$(DO_RTK) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64 + GCC:*_*_AARCH64_PP_FLAGS = -DDO_KCS=$(DO_KCS) -DDO_RTK=$(DO_RTK) -DNUM_CORES=$(NUM_CORES) -DARM_CPU_AARCH64
GCC:*_*_AARCH64_PLATFORM_FLAGS = -I$(BIN_DIR)/OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml/OUTPUT
@@ -523,19 +522,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gAmdModulePkgTokenSpaceGuid.PcdSataSerdesBase|0xE1200000 gAmdModulePkgTokenSpaceGuid.PcdSataSerdesOffset|0x00010000
-!if $(DO_XGBE) - gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable|TRUE - - gAmdModulePkgTokenSpaceGuid.PcdPort0PhyMode|0 - gAmdModulePkgTokenSpaceGuid.PcdPort1PhyMode|0 - gAmdModulePkgTokenSpaceGuid.PcdPort0NetSpeed|1 - gAmdModulePkgTokenSpaceGuid.PcdPort1NetSpeed|1 - - gAmdModulePkgTokenSpaceGuid.PcdEthMacA|0x02A1A2A3A4A5 - gAmdModulePkgTokenSpaceGuid.PcdEthMacB|0x02B1B2B3B4B5 -!endif - - ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -638,14 +624,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-!if $(DO_XGBE) - # - # SNP support - # - AmdModulePkg/SnpDxe/SnpDxePort0.inf - AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif - # # Networking stack # diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 3af47ef4c5b6..d6b18d3fd0f7 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -157,14 +157,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-!if $(DO_XGBE) - # - # SNP support - # - INF AmdModulePkg/SnpDxe/SnpDxePort0.inf - INF AmdModulePkg/SnpDxe/SnpDxePort1.inf -!endif - # # Networking stack #