From cbe38923d9da5b0f7fb1ccd9696d483b2e63429a Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 5 Jan 2016 19:40:41 -0700 Subject: northbridge/intel/x4x: clean up includes - Don't redefine D0F0_PCIEXBAR_LO, use the #define in x4x.h - Move TPMBASE and TPM32() definitions into iomap.h - Use "" style include for x4x.h in nortbridge files. - Move includes of .h files out of x4x.h and into the c files that need them. - Protect function definitions in bootblock. Change-Id: I3fdb579235c5446733a0ffba05fffe1a73381251 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/12849 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/northbridge/intel/x4x/bootblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/northbridge/intel/x4x/bootblock.c') diff --git a/src/northbridge/intel/x4x/bootblock.c b/src/northbridge/intel/x4x/bootblock.c index 0a8946c5ec..832fa7b8ec 100644 --- a/src/northbridge/intel/x4x/bootblock.c +++ b/src/northbridge/intel/x4x/bootblock.c @@ -15,10 +15,8 @@ */ #include - -#define D0F0_PCIEXBAR_LO 0x60 -#define TPMBASE 0xfed40000 -#define TPM32(x) *((volatile u32 *)(TPMBASE + x)) +#include "iomap.h" +#include "x4x.h" static void bootblock_northbridge_init(void) { -- cgit v1.2.3