diff options
| author | Martin Roth <martinroth@google.com> | 2016-01-05 19:40:41 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-01-13 17:52:46 +0100 |
| commit | cbe38923d9da5b0f7fb1ccd9696d483b2e63429a (patch) | |
| tree | e4260b894c351dfae1ce4c6fab628c3e288b26ed /src/northbridge/intel/x4x/x4x.h | |
| parent | d274c99ad73c60e93ee22e33f4794e47ec3ffb52 (diff) | |
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>
Diffstat (limited to 'src/northbridge/intel/x4x/x4x.h')
| -rw-r--r-- | src/northbridge/intel/x4x/x4x.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h index 89ca9313b9..c2269504a1 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__ */ |