Fix AMD SB800 (cimx) southbridge code to compile with gcc 4.6

Change-Id: I672135a9b6e3b641ceb655cb00d40ee760c17edc
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/268
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>

diff --git a/src/southbridge/amd/cimx/sb800/SBPLATFORM.h b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
index 164a65156f8c57136e424305410bb33bf2d0d10c..d7317a23a20747db39d6b2175989fe1f38383a19 100644 (file)
--- a/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
+++ b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
@@ -155,4 +155,7 @@ typedef union _PCI_ADDR {
 #define cimEhciTrafficHandingDefault    FALSE
 #define cimFusionMsgCMultiCoreDefault   FALSE
 #define cimFusionMsgCStageDefault       FALSE
+
+#include "vendorcode/amd/cimx/sb800/AMDSBLIB.h"
+
 #endif // _AMD_SBPLATFORM_H_

diff --git a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
index 6c92227eda8d0b65f49c95556dac690ffe663673..b2a0a1b75a5e1f1ea8c8907708c638bd2fbc603e 100644 (file)
--- a/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
+++ b/src/vendorcode/amd/cimx/sb800/AMDSBLIB.h
@@ -43,6 +43,8 @@
  *
  */
 
+#ifndef __VENDORCODE_AMD_CIMX_SB800_AMDSBLIB_H__
+#define __VENDORCODE_AMD_CIMX_SB800_AMDSBLIB_H__
 
 //AMDSBLIB Routines
 
@@ -116,3 +118,5 @@ void WriteIo32(IN unsigned short Address, IN unsigned int Data);
 //void CpuidRead(IN unsigned int CpuidFcnAddress, OUT CPUID_DATA *Value);
 void CpuidRead(unsigned int CpuidFcnAddress, CPUID_DATA *Value);
 unsigned char ReadNumberOfCpuCores(void);
+
+#endif