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 <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12849
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

6 files changed, 14 insertions, 10 deletions

diff --git a/src/northbridge/intel/x4x/bootblock.c b/src/northbridge/intel/x4x/bootblock.c
index 0a8946c5ec69..832fa7b8ecc7 100644
--- a/src/northbridge/intel/x4x/bootblock.c
+++ b/src/northbridge/intel/x4x/bootblock.c
@@ -15,10 +15,8 @@
  */
 
 #include <arch/io.h>
-
-#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)
 {
diff --git a/src/northbridge/intel/x4x/early_init.c b/src/northbridge/intel/x4x/early_init.c
index 1d43e0aca5a5..b98c42eb5d3c 100644
--- a/src/northbridge/intel/x4x/early_init.c
+++ b/src/northbridge/intel/x4x/early_init.c
@@ -16,6 +16,8 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include "iomap.h"
+#include <southbridge/intel/i82801gx/i82801gx.h> /* DEFAULT_PMBASE */
 #include "x4x.h"
 
 void x4x_early_init(void)
diff --git a/src/northbridge/intel/x4x/iomap.h b/src/northbridge/intel/x4x/iomap.h
index 34153c1b4a69..fc25f9ca4633 100644
--- a/src/northbridge/intel/x4x/iomap.h
+++ b/src/northbridge/intel/x4x/iomap.h
@@ -25,4 +25,7 @@
 #define DEFAULT_EPBAR		0xfed19000	/* 4 KB */
 #define DEFAULT_HECIBAR		0xfed10000
 
+#define TPMBASE 0xfed40000
+#define TPM32(x) *((volatile u32 *)(TPMBASE + x))
+
 #endif /* X4X_IOMAP_H */
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index f5a4e5ff5143..6efdcd3bb325 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -22,7 +22,9 @@
 #include <delay.h>
 #include <halt.h>
 #include <lib.h>
-#include <northbridge/intel/x4x/x4x.h>
+#include "iomap.h"
+#include <southbridge/intel/i82801gx/i82801gx.h> /* smbus_read_byte */
+#include "x4x.h"
 #include <pc80/mc146818rtc.h>
 #include <spd.h>
 #include <string.h>
diff --git a/src/northbridge/intel/x4x/raminit_ddr2.c b/src/northbridge/intel/x4x/raminit_ddr2.c
index 240232182622..d77c2c4879d3 100644
--- a/src/northbridge/intel/x4x/raminit_ddr2.c
+++ b/src/northbridge/intel/x4x/raminit_ddr2.c
@@ -20,7 +20,8 @@
 #include <console/console.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
-#include <northbridge/intel/x4x/x4x.h>
+#include "iomap.h"
+#include "x4x.h"
 
 static inline void barrier(void)
 {
diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h
index 89ca9313b9f2..c2269504a16d 100644
--- a/src/northbridge/intel/x4x/x4x.h
+++ b/src/northbridge/intel/x4x/x4x.h
@@ -18,9 +18,6 @@
 #ifndef __NORTHBRIDGE_INTEL_X4X_H__
 #define __NORTHBRIDGE_INTEL_X4X_H__
 
-#include <northbridge/intel/x4x/iomap.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
-
 /*
  * D0:F0
  */
@@ -307,6 +304,7 @@ enum ddr2_signals {
         DQ8
 };
 
+#ifndef __BOOTBLOCK__
 void x4x_early_init(void);
 u32 decode_igd_memory_size(u32 gms);
 u32 decode_igd_gtt_size(u32 gsm);
@@ -316,5 +314,5 @@ void raminit_ddr2(struct sysinfo *);
 
 struct acpi_rsdp;
 unsigned long northbridge_write_acpi_tables(device_t device, unsigned long start, struct acpi_rsdp *rsdp);
-
+#endif
 #endif /* __NORTHBRIDGE_INTEL_X4X_H__ */