[Linaro-uefi,4/5] Platforms/AMD/Styx: switch to our own version of MAC PCDs

Message ID 1463157431-22988-4-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel May 13, 2016, 4:37 p.m.
In preparation of switching to a version of AmdModulePkg without any
dynamic PCDs, introduce our own versions of the XGBE MAC address PCDs
and use them instead of the AmdModulePkg ones.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/AMD/Styx/AcpiTables/AcpiTables.inf           | 4 ++--
 Platforms/AMD/Styx/AmdStyx.dec                         | 3 +++
 Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf | 4 ++--
 Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf    | 5 ++---
 Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc   | 5 +++--
 5 files changed, 12 insertions(+), 9 deletions(-)

Patch

diff --git a/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf b/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf
index 6bcee5ec664a..ab5239f46c69 100644
--- a/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf
+++ b/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf
@@ -60,8 +60,8 @@ 
 [Pcd]
   gAmdStyxTokenSpaceGuid.PcdSocCoreCount
   gAmdStyxTokenSpaceGuid.PcdSocCpuId
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacA
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacB
+  gAmdStyxTokenSpaceGuid.PcdEthMacA
+  gAmdStyxTokenSpaceGuid.PcdEthMacB
 
 [FixedPcd]
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
diff --git a/Platforms/AMD/Styx/AmdStyx.dec b/Platforms/AMD/Styx/AmdStyx.dec
index bf860c3dfeb6..026b29a40399 100644
--- a/Platforms/AMD/Styx/AmdStyx.dec
+++ b/Platforms/AMD/Styx/AmdStyx.dec
@@ -38,6 +38,9 @@ 
   gAmdStyxTokenSpaceGuid.PcdSocCoreCount|1|UINT32|0x00000100
   gAmdStyxTokenSpaceGuid.PcdSocCpuId|1|UINT32|0x00000101
 
+  gAmdStyxTokenSpaceGuid.PcdEthMacA|0|UINT64|0x000d0001
+  gAmdStyxTokenSpaceGuid.PcdEthMacB|0|UINT64|0x000d0002
+
 [PcdsFixedAtBuild]
   # CPUID Register
   gAmdStyxTokenSpaceGuid.PcdCpuIdRegister|0xE0000010|UINT32|0x00000200
diff --git a/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf b/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
index ec673a830789..8c77e6cb9d74 100644
--- a/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
+++ b/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf
@@ -63,8 +63,8 @@ 
   gAmdStyxTokenSpaceGuid.PcdSocCoreCount
   gAmdStyxTokenSpaceGuid.PcdSocCpuId
 
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacA
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacB
+  gAmdStyxTokenSpaceGuid.PcdEthMacA
+  gAmdStyxTokenSpaceGuid.PcdEthMacB
 
 [FixedPcd]
   gAmdStyxTokenSpaceGuid.PcdIscpSupport
diff --git a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf
index ecd2284724c2..2b2862a19e02 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf
+++ b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf
@@ -65,9 +65,8 @@ 
 [Pcd]
   gAmdStyxTokenSpaceGuid.PcdStyxFdt
   gAmdStyxTokenSpaceGuid.PcdSocCpuId
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacA
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacB
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacB
+  gAmdStyxTokenSpaceGuid.PcdEthMacA
+  gAmdStyxTokenSpaceGuid.PcdEthMacB
   gArmTokenSpaceGuid.PcdSystemMemoryBase
 
 [FixedPcd]
diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
index aa236fb0d258..dcbfd17152ea 100644
--- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc
@@ -480,8 +480,9 @@  DEFINE DO_RTK       = 0
   gAmdModulePkgTokenSpaceGuid.PcdPort0NetSpeed|1
   gAmdModulePkgTokenSpaceGuid.PcdPort1NetSpeed|1
 
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacA|0x02A1A2A3A4A5
-  gAmdModulePkgTokenSpaceGuid.PcdEthMacB|0x02B1B2B3B4B5
+[PcdsDynamicDefault.common]
+  gAmdStyxTokenSpaceGuid.PcdEthMacA|0x02A1A2A3A4A5
+  gAmdStyxTokenSpaceGuid.PcdEthMacB|0x02B1B2B3B4B5
 !endif
 
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0x0