From 77757c22b9eede92234d07d65a23fdf4b970c8cf Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 4 Jan 2015 21:33:39 +1100 Subject: mainboard/*/romstage.c: Sanitize system header inclusions Fix system include paths to be consistent. Chipset support is part of the Coreboot 'system' and hence 'non-local' (i.e., in the same directory or context). One possible product of this, is to perhaps allow future work to do pre-compiled headers (PCH) on the buildbot for faster build times. However, this currently just makes mainboard's consistent. Change-Id: I2f3fd8a3d7864926461c960ca619bff635d7dea5 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/8085 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc --- src/mainboard/amd/bimini_fam10/romstage.c | 12 ++++++------ src/mainboard/amd/db800/romstage.c | 8 ++++---- src/mainboard/amd/dbm690t/romstage.c | 8 ++++---- src/mainboard/amd/dinar/romstage.c | 4 ++-- src/mainboard/amd/inagua/romstage.c | 4 ++-- src/mainboard/amd/mahogany/romstage.c | 12 ++++++------ src/mainboard/amd/mahogany_fam10/romstage.c | 16 ++++++++-------- src/mainboard/amd/norwich/romstage.c | 8 ++++---- src/mainboard/amd/olivehill/romstage.c | 8 ++++---- src/mainboard/amd/olivehillplus/romstage.c | 8 ++++---- src/mainboard/amd/parmer/romstage.c | 8 ++++---- src/mainboard/amd/persimmon/romstage.c | 8 ++++---- src/mainboard/amd/pistachio/romstage.c | 8 ++++---- src/mainboard/amd/rumba/romstage.c | 6 +++--- src/mainboard/amd/serengeti_cheetah/romstage.c | 6 +++--- src/mainboard/amd/serengeti_cheetah_fam10/romstage.c | 12 ++++++------ src/mainboard/amd/south_station/romstage.c | 4 ++-- src/mainboard/amd/thatcher/romstage.c | 8 ++++---- src/mainboard/amd/tilapia_fam10/romstage.c | 16 ++++++++-------- src/mainboard/amd/torpedo/romstage.c | 4 ++-- src/mainboard/amd/union_station/romstage.c | 4 ++-- 21 files changed, 86 insertions(+), 86 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c index ef85df2bed..73c41e3dda 100644 --- a/src/mainboard/amd/bimini_fam10/romstage.c +++ b/src/mainboard/amd/bimini_fam10/romstage.c @@ -34,13 +34,13 @@ #include #include #include -#include "northbridge/amd/amdfam10/raminit.h" -#include "northbridge/amd/amdfam10/amdfam10.h" +#include +#include #include -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdfam10/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include #include "northbridge/amd/amdfam10/setup_resource_map.c" #include "southbridge/amd/rs780/early_setup.c" @@ -57,12 +57,12 @@ static int spd_read_byte(u32 device, u32 address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdfam10/amdfam10.h" +#include #include "northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c" #include "northbridge/amd/amdfam10/pci.c" #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" -#include "cpu/amd/microcode.h" +#include #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index 63e9275141..e7532cf540 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -24,16 +24,16 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/msr.h" +#include +#include #include -#include "southbridge/amd/cs5536/cs5536.h" +#include #include #include "southbridge/amd/cs5536/early_smbus.c" #include "southbridge/amd/cs5536/early_setup.c" #include #include -#include "northbridge/amd/lx/raminit.h" +#include #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c index c9a04f5eef..5b9b6ca0ad 100644 --- a/src/mainboard/amd/dbm690t/romstage.c +++ b/src/mainboard/amd/dbm690t/romstage.c @@ -26,14 +26,14 @@ #include #include #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdk8/reset_test.c" #include #include #include -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/amd/rs690/early_setup.c" #include "southbridge/amd/sb600/early_setup.c" @@ -49,7 +49,7 @@ static inline int spd_read_byte(u32 device, u32 address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdk8/amdk8.h" +#include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index ad6bce358d..64efdd642d 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -30,10 +30,10 @@ #include #include #include -#include "cpu/x86/bist.h" +#include #include #include -#include "cpu/x86/lapic.h" +#include #include "nb_cimx.h" #include diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/romstage.c index 1a80e5ce13..1f63979263 100644 --- a/src/mainboard/amd/inagua/romstage.c +++ b/src/mainboard/amd/inagua/romstage.c @@ -32,9 +32,9 @@ #include #include #include -#include "cpu/x86/bist.h" +#include #include -#include "cpu/x86/lapic.h" +#include #include #include "SBPLATFORM.h" diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c index 00223aed74..6e3de074fc 100644 --- a/src/mainboard/amd/mahogany/romstage.c +++ b/src/mainboard/amd/mahogany/romstage.c @@ -27,17 +27,17 @@ #include #include #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdk8/reset_test.c" #include #include -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/amd/rs780/early_setup.c" -#include "southbridge/amd/sb700/sb700.h" -#include "southbridge/amd/sb700/smbus.h" +#include +#include #include "northbridge/amd/amdk8/debug.c" /* After sb700/early_setup.c! */ #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) @@ -50,7 +50,7 @@ static inline int spd_read_byte(u32 device, u32 address) return do_smbus_read_byte(SMBUS_IO_BASE, device, address); } -#include "northbridge/amd/amdk8/amdk8.h" +#include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c index b940be0964..0a6a3308f7 100644 --- a/src/mainboard/amd/mahogany_fam10/romstage.c +++ b/src/mainboard/amd/mahogany_fam10/romstage.c @@ -34,20 +34,20 @@ #include #include #include -#include "northbridge/amd/amdfam10/raminit.h" -#include "northbridge/amd/amdfam10/amdfam10.h" +#include +#include #include -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdfam10/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include #include #include #include "northbridge/amd/amdfam10/setup_resource_map.c" #include "southbridge/amd/rs780/early_setup.c" -#include "southbridge/amd/sb700/sb700.h" -#include "southbridge/amd/sb700/smbus.h" +#include +#include #include "northbridge/amd/amdfam10/debug.c" #include @@ -60,12 +60,12 @@ static int spd_read_byte(u32 device, u32 address) return do_smbus_read_byte(SMBUS_IO_BASE, device, address); } -#include "northbridge/amd/amdfam10/amdfam10.h" +#include #include "northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c" #include "northbridge/amd/amdfam10/pci.c" #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" -#include "cpu/amd/microcode.h" +#include #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 2c8293742f..9daa1d6776 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -24,14 +24,14 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/msr.h" +#include +#include #include -#include "southbridge/amd/cs5536/cs5536.h" +#include #include #include "southbridge/amd/cs5536/early_smbus.c" #include "southbridge/amd/cs5536/early_setup.c" -#include "northbridge/amd/lx/raminit.h" +#include int spd_read_byte(unsigned int device, unsigned int address) { diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c index 82dcd602de..226278236f 100644 --- a/src/mainboard/amd/olivehill/romstage.c +++ b/src/mainboard/amd/olivehill/romstage.c @@ -31,10 +31,10 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/lapic.h" -#include "southbridge/amd/agesa/hudson/hudson.h" -#include "cpu/amd/agesa/s3_resume.h" +#include +#include +#include +#include #include "cbmem.h" diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c index f603d738c5..6fa3af6bb9 100644 --- a/src/mainboard/amd/olivehillplus/romstage.c +++ b/src/mainboard/amd/olivehillplus/romstage.c @@ -32,10 +32,10 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/lapic.h" -#include "southbridge/amd/pi/avalon/hudson.h" -#include "cpu/amd/pi/s3_resume.h" +#include +#include +#include +#include void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { diff --git a/src/mainboard/amd/parmer/romstage.c b/src/mainboard/amd/parmer/romstage.c index e38d715c8b..1fb709a372 100644 --- a/src/mainboard/amd/parmer/romstage.c +++ b/src/mainboard/amd/parmer/romstage.c @@ -31,10 +31,10 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/lapic.h" -#include "southbridge/amd/agesa/hudson/hudson.h" -#include "cpu/amd/agesa/s3_resume.h" +#include +#include +#include +#include #include "cbmem.h" diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c index 581c2c2858..2fdab4153c 100644 --- a/src/mainboard/amd/persimmon/romstage.c +++ b/src/mainboard/amd/persimmon/romstage.c @@ -32,16 +32,16 @@ #include #include #include -#include "cpu/x86/bist.h" +#include #include #include -#include "cpu/x86/lapic.h" +#include #include #include #include "SBPLATFORM.h" #include "cbmem.h" -#include "cpu/amd/mtrr.h" -#include "cpu/amd/agesa/s3_resume.h" +#include +#include #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1) diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c index af4253d705..906ff850cf 100644 --- a/src/mainboard/amd/pistachio/romstage.c +++ b/src/mainboard/amd/pistachio/romstage.c @@ -26,12 +26,12 @@ #include #include #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdk8/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/amd/rs690/early_setup.c" #include "southbridge/amd/sb600/early_setup.c" @@ -45,7 +45,7 @@ static inline int spd_read_byte(u32 device, u32 address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdk8/amdk8.h" +#include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "northbridge/amd/amdk8/coherent_ht.c" diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index 248baa0d3a..fb21b2f3c6 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -5,8 +5,8 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/msr.h" +#include +#include #include #include #include "southbridge/amd/cs5536/early_smbus.c" @@ -22,7 +22,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) return smbus_read_byte(device, address); } -#include "northbridge/amd/gx2/raminit.h" +#include #include "northbridge/amd/gx2/pll_reset.c" #include "northbridge/amd/gx2/raminit.c" #include "lib/generic_sdram.c" diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c index ec0682a667..f49aa61dd1 100644 --- a/src/mainboard/amd/serengeti_cheetah/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah/romstage.c @@ -9,9 +9,9 @@ #include #include "southbridge/amd/amd8111/early_smbus.c" #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "northbridge/amd/amdk8/reset_test.c" -#include "cpu/x86/bist.h" +#include #include "lib/delay.c" #include "northbridge/amd/amdk8/debug.c" #include @@ -50,7 +50,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdk8/amdk8.h" +#include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c index df968c3e96..749b48ede6 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c @@ -35,14 +35,14 @@ #include #include #include "southbridge/amd/amd8111/early_smbus.c" -#include "northbridge/amd/amdfam10/raminit.h" -#include "northbridge/amd/amdfam10/amdfam10.h" +#include +#include #include #include -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdfam10/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdfam10/debug.c" #include #include @@ -79,12 +79,12 @@ static int spd_read_byte(u32 device, u32 address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdfam10/amdfam10.h" +#include #include "northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c" #include "northbridge/amd/amdfam10/pci.c" #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" -#include "cpu/amd/microcode.h" +#include #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" diff --git a/src/mainboard/amd/south_station/romstage.c b/src/mainboard/amd/south_station/romstage.c index ccf84b61cf..5f902c312e 100644 --- a/src/mainboard/amd/south_station/romstage.c +++ b/src/mainboard/amd/south_station/romstage.c @@ -32,10 +32,10 @@ #include #include #include -#include "cpu/x86/bist.h" +#include #include #include -#include "cpu/x86/lapic.h" +#include #include #include "SBPLATFORM.h" diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c index 319cd3a8bd..30808a4dfd 100644 --- a/src/mainboard/amd/thatcher/romstage.c +++ b/src/mainboard/amd/thatcher/romstage.c @@ -31,11 +31,11 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/lapic.h" -#include "southbridge/amd/agesa/hudson/hudson.h" +#include +#include +#include #include "src/superio/smsc/lpc47n217/early_serial.c" -#include "cpu/amd/agesa/s3_resume.h" +#include #include "cbmem.h" #define SERIAL_DEV PNP_DEV(0x2e, LPC47N217_SP1) diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c index c4ccc70096..0b6b7db594 100644 --- a/src/mainboard/amd/tilapia_fam10/romstage.c +++ b/src/mainboard/amd/tilapia_fam10/romstage.c @@ -34,20 +34,20 @@ #include #include #include -#include "northbridge/amd/amdfam10/raminit.h" -#include "northbridge/amd/amdfam10/amdfam10.h" +#include +#include #include -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdfam10/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include #include #include #include "northbridge/amd/amdfam10/setup_resource_map.c" #include "southbridge/amd/rs780/early_setup.c" -#include "southbridge/amd/sb700/sb700.h" -#include "southbridge/amd/sb700/smbus.h" +#include +#include #include "northbridge/amd/amdfam10/debug.c" #define SERIAL_DEV PNP_DEV(0x2e, IT8718F_SP1) @@ -59,12 +59,12 @@ static int spd_read_byte(u32 device, u32 address) return do_smbus_read_byte(SMBUS_IO_BASE, device, address); } -#include "northbridge/amd/amdfam10/amdfam10.h" +#include #include "northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c" #include "northbridge/amd/amdfam10/pci.c" #include "resourcemap.c" #include "cpu/amd/quadcore/quadcore.c" -#include "cpu/amd/microcode.h" +#include #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c index e3f41a070b..6c2f2c5b16 100644 --- a/src/mainboard/amd/torpedo/romstage.c +++ b/src/mainboard/amd/torpedo/romstage.c @@ -29,9 +29,9 @@ #include #include #include -#include "cpu/x86/bist.h" +#include #include -#include "cpu/x86/lapic.h" +#include #include "sb_cimx.h" #include "SbPlatform.h" #include diff --git a/src/mainboard/amd/union_station/romstage.c b/src/mainboard/amd/union_station/romstage.c index c75cf7a270..714eb3c1fe 100644 --- a/src/mainboard/amd/union_station/romstage.c +++ b/src/mainboard/amd/union_station/romstage.c @@ -32,8 +32,8 @@ #include #include #include -#include "cpu/x86/bist.h" -#include "cpu/x86/lapic.h" +#include +#include #include #include "SBPLATFORM.h" -- cgit v1.2.3