[PATCH edk2-platforms 32/41] LS2088 : Enable support of FpgaLib

[Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>]

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Wasim Khan <wasim.khan@nxp.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc |  3 +++
 Silicon/NXP/Include/Chassis3/Soc.h           |  1 -
 Silicon/NXP/LS2088A/LS2088A.dsc.inc          |  1 +
 Silicon/NXP/Library/SocLib/Chassis3/Soc.c    | 13 ++++++++++++-
 Silicon/NXP/Library/SocLib/LS2088aSocLib.inf |  2 ++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
index 465c59e..76d51a2 100755
--- a/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
+++ b/Platform/NXP/LS2088aRdbPkg/LS2088aRdbPkg.dsc
@@ -39,6 +39,9 @@
   SerialPortLib|Silicon/NXP/Library/DUartPortLib/DUartPortLib.inf
   IoAccessLib|Silicon/NXP/Library/IoAccessLib/IoAccessLib.inf
   RealTimeClockLib|Silicon/Maxim/Library/Ds3232RtcLib/Ds3232RtcLib.inf
+  IfcLib|Silicon/NXP/Library/IfcLib/IfcLib.inf
+  BoardLib|Platform/NXP/LS2088aRdbPkg/Library/BoardLib/BoardLib.inf
+  FpgaLib|Platform/NXP/LS2088aRdbPkg/Library/FpgaLib/FpgaLib.inf
 
 [PcdsFixedAtBuild.common]
 
diff --git a/Silicon/NXP/Include/Chassis3/Soc.h b/Silicon/NXP/Include/Chassis3/Soc.h
index 8d967e7..0dd9eee 100644
--- a/Silicon/NXP/Include/Chassis3/Soc.h
+++ b/Silicon/NXP/Include/Chassis3/Soc.h
@@ -22,7 +22,6 @@
 #define FSL_CLUSTER_CLOCKS         { 1, 1, 4, 4 } /* LS208x */
 #define TP_CLUSTER_EOC_MASK        0x80000000      /* Mask for End of clusters */
 #define NUM_CC_PLLS                6
-#define CLK_FREQ                   100000000
 #define MAX_CPUS                   16
 #define CHECK_CLUSTER(Cluster)     ((Cluster & TP_CLUSTER_EOC_MASK) != TP_CLUSTER_EOC_MASK)
 
diff --git a/Silicon/NXP/LS2088A/LS2088A.dsc.inc b/Silicon/NXP/LS2088A/LS2088A.dsc.inc
index 8f7dbb5..2cff40f 100644
--- a/Silicon/NXP/LS2088A/LS2088A.dsc.inc
+++ b/Silicon/NXP/LS2088A/LS2088A.dsc.inc
@@ -67,5 +67,6 @@
   gNxpQoriqLsTokenSpaceGuid.PcdI2c0BaseAddr|0x02000000
   gNxpQoriqLsTokenSpaceGuid.PcdI2cSize|0x10000
   gNxpQoriqLsTokenSpaceGuid.PcdNumI2cController|4
+  gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x02240000
 
 ##
diff --git a/Silicon/NXP/Library/SocLib/Chassis3/Soc.c b/Silicon/NXP/Library/SocLib/Chassis3/Soc.c
index 0fc92f4..d334bb7 100644
--- a/Silicon/NXP/Library/SocLib/Chassis3/Soc.c
+++ b/Silicon/NXP/Library/SocLib/Chassis3/Soc.c
@@ -19,11 +19,15 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/IfcLib.h>
 #include <Library/IoLib.h>
 #include <Library/PcdLib.h>
 #include <Library/PrintLib.h>
 #include <Library/SerialPortLib.h>
 
+extern VOID PrintBoardPersonality (VOID);
+extern UINTN GetBoardSysClk (VOID);
+
 VOID
 GetSysInfo (
   OUT SYS_INFO *PtrSysInfo
@@ -82,7 +86,7 @@ GetSysInfo (
 
   GurBase = (VOID *)PcdGet64 (PcdGutsBaseAddr);
   ClkBase = (VOID *)PcdGet64 (PcdClkBaseAddr);
-  SysClk = CLK_FREQ;
+  SysClk = GetBoardSysClk ();
 
   PtrSysInfo->FreqSystemBus = SysClk;
   PtrSysInfo->FreqDdrBus = PcdGet64 (PcdDdrClk);
@@ -151,6 +155,8 @@ SocInit (
   //
   SmmuInit ();
 
+  IfcInit ();
+
   //
   //  Initialize the Serial Port.
   //  Early serial port initialization is required to print RCW,
@@ -177,4 +183,9 @@ SocInit (
   // Print Soc Personality information
   //
   PrintSoc ();
+
+  //
+  // Print Board Personality information
+  //
+  PrintBoardPersonality ();
 }
diff --git a/Silicon/NXP/Library/SocLib/LS2088aSocLib.inf b/Silicon/NXP/Library/SocLib/LS2088aSocLib.inf
index 3d9237d..9547f5a 100644
--- a/Silicon/NXP/Library/SocLib/LS2088aSocLib.inf
+++ b/Silicon/NXP/Library/SocLib/LS2088aSocLib.inf
@@ -29,6 +29,8 @@
 [LibraryClasses]
   BaseLib
   DebugLib
+  FpgaLib
+  IfcLib
   IoAccessLib
   SerialPortLib
 
-- 
1.9.1