[commit] r6559 - in trunk/src: southbridge/amd/cimx_wrapper/sb800 vendorcode/amd/cimx/sb800

[repository service]

Author: kerry
Date: Sat May  7 10:43:40 2011
New Revision: 6559
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6559

Log:
SB800 CIMX code can share the AGESA V5 lib code,
some platform only use sb800 cimx code, not use AGESA v5 code.
for such platform, one can compile the sb800 cimx and AGESA v5 lib code.

Signed-off-by: Kerry She 
Acked-by: Marc Jones

Modified:
   trunk/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
   trunk/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
   trunk/src/vendorcode/amd/cimx/sb800/SBCMN.c

Modified: trunk/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
==============================================================================
--- trunk/src/southbridge/amd/cimx_wrapper/sb800/Amd.h	Sat May  7 10:37:38 2011	(r6558)
+++ trunk/src/southbridge/amd/cimx_wrapper/sb800/Amd.h	Sat May  7 10:43:40 2011	(r6559)
@@ -161,7 +161,7 @@
   IN OUT   unsigned int          EBX_Reg;                ///< CPUID instruction result in EBX
   IN OUT   unsigned int          ECX_Reg;                ///< CPUID instruction result in ECX
   IN OUT   unsigned int          EDX_Reg;                ///< CPUID instruction result in EDX
-} SB_CPUID_DATA;
+} CPUID_DATA;

#define WARM_RESET 1
 #define COLD_RESET 2      // Cold reset

Modified: trunk/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
==============================================================================
--- trunk/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h	Sat May  7 10:37:38 2011	(r6558)
+++ trunk/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h	Sat May  7 10:43:40 2011	(r6559)
@@ -104,3 +104,14 @@
  *
  */
 void AmdSbCopyMem (IN void* pDest, IN void* pSource, IN unsigned int Length);
+
+
+/* SB800 CIMx and AGESA V5 can share lib functions */
+unsigned char ReadIo8(IN unsigned short Address);
+unsigned short ReadIo16(IN unsigned short Address);
+unsigned int ReadIo32(IN unsigned short Address);
+void WriteIo8(IN unsigned short Address, IN unsigned char Data);
+void WriteIo16(IN unsigned short Address, IN unsigned short Data);
+void WriteIo32(IN unsigned short Address, IN unsigned int Data);
+void CpuidRead(IN unsigned int CpuidFcnAddress, OUT CPUID_DATA *Value);
+unsigned char ReadNumberOfCpuCores(void);

Modified: trunk/src/vendorcode/amd/cimx/sb800/SBCMN.c
==============================================================================
--- trunk/src/vendorcode/amd/cimx/sb800/SBCMN.c	Sat May  7 10:37:38 2011	(r6558)
+++ trunk/src/vendorcode/amd/cimx/sb800/SBCMN.c	Sat May  7 10:43:40 2011	(r6559)
@@ -329,7 +329,7 @@
 {
   UINT32   abValue;
   UINT16   dwTempVar;
-  SB_CPUID_DATA  CpuId;
+  CPUID_DATA  CpuId;
   UINT8   cimNativepciesupport;
   UINT8   cimIrConfig;
   UINT8   Data;