From eb995c209c81bcc0851335dd9bc3b1f38965271d Mon Sep 17 00:00:00 2001 From: Kerry She Date: Sat, 7 May 2011 08:43:40 +0000 Subject: 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6559 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/southbridge/amd/cimx_wrapper/sb800/Amd.h | 2 +- src/vendorcode/amd/cimx/sb800/AMDSBLIB.h | 11 +++++++++++ src/vendorcode/amd/cimx/sb800/SBCMN.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h b/src/southbridge/amd/cimx_wrapper/sb800/Amd.h index 5eaad0adaa..6f2d5f17a6 100644 --- a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h +++ b/src/southbridge/amd/cimx_wrapper/sb800/Amd.h @@ -161,7 +161,7 @@ typedef struct _SB_CPUID_DATA { 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 diff --git a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h index e5ecd3b582..83722d8f5d 100644 --- a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h +++ b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h @@ -104,3 +104,14 @@ AGESA_STATUS AmdSbDispatcher (IN void *pConfig); * */ 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); diff --git a/src/vendorcode/amd/cimx/sb800/SBCMN.c b/src/vendorcode/amd/cimx/sb800/SBCMN.c index a27f0feaaa..ea1c029d1f 100644 --- a/src/vendorcode/amd/cimx/sb800/SBCMN.c +++ b/src/vendorcode/amd/cimx/sb800/SBCMN.c @@ -329,7 +329,7 @@ commonInitEarlyBoot ( { UINT32 abValue; UINT16 dwTempVar; - SB_CPUID_DATA CpuId; + CPUID_DATA CpuId; UINT8 cimNativepciesupport; UINT8 cimIrConfig; UINT8 Data; -- cgit v1.2.3