We already have a boolean PCD that tells us whether XGBE support should be enabled, so use it instead of C preprocessor conditionals.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <[email protected]> --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 1 + Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 39 +++++++------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf index 87cdcb3e6b25..af57ab24f084 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf @@ -50,6 +50,7 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase [FixedPcd] + gAmdModulePkgTokenSpaceGuid.PcdXgbeEnable gArmPlatformTokenSpaceGuid.PcdCoreCount gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index b1e4984d3fd0..db7d9b077c32 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -161,8 +161,6 @@ SetDeviceStatus ( } } -#if DO_XGBE - #define MAC_ADDRESS_BYTES 6 STATIC @@ -192,8 +190,6 @@ SetMacAddress ( } } -#endif - STATIC VOID DisableSmmu ( @@ -242,7 +238,6 @@ SetSocIdStatus ( { UINT32 SocId; BOOLEAN IsRevB1; - BOOLEAN DisableXgbeSmmus; SocId = PcdGet32 (PcdSocCpuId); IsRevB1 = (SocId & STYX_SOC_VERSION_MASK) >= STYX_SOC_VERSION_B1; @@ -267,13 +262,7 @@ SetSocIdStatus ( DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/sata@e0d00000"); } -#if DO_XGBE - DisableXgbeSmmus = !PcdGetBool (PcdEnableSmmus); -#else - DisableXgbeSmmus = TRUE; -#endif - - if (DisableXgbeSmmus) { + if (!FixedPcdGetBool (PcdXgbeEnable) || !PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommus", "/smb/smmu@e0600000", "/smb/xgmac@e0700000"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0800000", "/smb/xgmac@e0900000"); } @@ -285,20 +274,20 @@ SetXgbeStatus ( IN VOID *Fdt ) { -#if DO_XGBE - SetDeviceStatus (Fdt, "xgmac@e0700000", TRUE); - SetDeviceStatus (Fdt, "phy@e1240800", TRUE); - SetDeviceStatus (Fdt, "xgmac@e0900000", TRUE); - SetDeviceStatus (Fdt, "phy@e1240c00", TRUE); + if (FixedPcdGetBool (PcdXgbeEnable)) { + SetDeviceStatus (Fdt, "xgmac@e0700000", TRUE); + SetDeviceStatus (Fdt, "phy@e1240800", TRUE); + SetDeviceStatus (Fdt, "xgmac@e0900000", TRUE); + SetDeviceStatus (Fdt, "phy@e1240c00", TRUE); - SetMacAddress (Fdt, "xgmac@e0700000", PcdGetPtr (PcdEthMacA)); - SetMacAddress (Fdt, "xgmac@e0900000", PcdGetPtr (PcdEthMacB)); -#else - SetDeviceStatus (Fdt, "xgmac@e0700000", FALSE); - SetDeviceStatus (Fdt, "phy@e1240800", FALSE); - SetDeviceStatus (Fdt, "xgmac@e0900000", FALSE); - SetDeviceStatus (Fdt, "phy@e1240c00", FALSE); -#endif + SetMacAddress (Fdt, "xgmac@e0700000", PcdGetPtr (PcdEthMacA)); + SetMacAddress (Fdt, "xgmac@e0900000", PcdGetPtr (PcdEthMacB)); + } else { + SetDeviceStatus (Fdt, "xgmac@e0700000", FALSE); + SetDeviceStatus (Fdt, "phy@e1240800", FALSE); + SetDeviceStatus (Fdt, "xgmac@e0900000", FALSE); + SetDeviceStatus (Fdt, "phy@e1240c00", FALSE); + } } -- 2.19.2 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
