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/asus/a8n_e/romstage.c | 10 +++++----- src/mainboard/asus/a8v-e_deluxe/romstage.c | 8 ++++---- src/mainboard/asus/a8v-e_se/romstage.c | 8 ++++---- src/mainboard/asus/dsbf/romstage.c | 4 ++-- src/mainboard/asus/k8v-x/romstage.c | 8 ++++---- src/mainboard/asus/m2n-e/romstage.c | 10 +++++----- src/mainboard/asus/m2v-mx_se/romstage.c | 6 +++--- src/mainboard/asus/m2v/romstage.c | 6 +++--- src/mainboard/asus/m4a78-em/romstage.c | 16 ++++++++-------- src/mainboard/asus/m4a785-m/romstage.c | 16 ++++++++-------- src/mainboard/asus/m5a88-v/romstage.c | 10 +++++----- src/mainboard/asus/mew-am/romstage.c | 6 +++--- src/mainboard/asus/mew-vm/romstage.c | 6 +++--- src/mainboard/asus/p2b-d/romstage.c | 6 +++--- src/mainboard/asus/p2b-ds/romstage.c | 6 +++--- src/mainboard/asus/p2b-f/romstage.c | 6 +++--- src/mainboard/asus/p2b-ls/romstage.c | 6 +++--- src/mainboard/asus/p2b/romstage.c | 6 +++--- src/mainboard/asus/p3b-f/romstage.c | 6 +++--- 19 files changed, 75 insertions(+), 75 deletions(-) (limited to 'src/mainboard/asus') diff --git a/src/mainboard/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c index c0fa6a52fd..34f4514d0b 100644 --- a/src/mainboard/asus/a8n_e/romstage.c +++ b/src/mainboard/asus/a8n_e/romstage.c @@ -32,18 +32,18 @@ #include #include #include -#include "cpu/x86/lapic.h" +#include #include "northbridge/amd/amdk8/reset_test.c" #include #include #include #include #include "northbridge/amd/amdk8/incoherent_ht.c" -#include "southbridge/nvidia/ck804/early_smbus.h" -#include "northbridge/amd/amdk8/raminit.h" +#include +#include #include "lib/delay.c" #include "northbridge/amd/amdk8/debug.c" -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "cpu/amd/dualcore/dualcore.c" @@ -59,7 +59,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/amd/amdk8/raminit.c" #include "lib/generic_sdram.c" -#include "southbridge/nvidia/ck804/early_setup_ss.h" +#include #include "southbridge/nvidia/ck804/early_setup.c" #include "cpu/amd/model_fxx/init_cpus.c" #include "northbridge/amd/amdk8/early_ht.c" diff --git a/src/mainboard/asus/a8v-e_deluxe/romstage.c b/src/mainboard/asus/a8v-e_deluxe/romstage.c index 0d55e532f0..f96d4be5e5 100644 --- a/src/mainboard/asus/a8v-e_deluxe/romstage.c +++ b/src/mainboard/asus/a8v-e_deluxe/romstage.c @@ -34,16 +34,16 @@ unsigned int get_sbdn(unsigned bus); #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 "northbridge/amd/amdk8/early_ht.c" #include #include #include "southbridge/via/vt8237r/early_smbus.c" #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include @@ -76,7 +76,7 @@ void soft_reset(void) } #include "southbridge/via/k8t890/early_car.c" -#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.c" diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c index 3ed2491737..0b954750b5 100644 --- a/src/mainboard/asus/a8v-e_se/romstage.c +++ b/src/mainboard/asus/a8v-e_se/romstage.c @@ -34,16 +34,16 @@ unsigned int get_sbdn(unsigned bus); #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 "northbridge/amd/amdk8/early_ht.c" #include #include #include "southbridge/via/vt8237r/early_smbus.c" #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include @@ -76,7 +76,7 @@ void soft_reset(void) } #include "southbridge/via/k8t890/early_car.c" -#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.c" diff --git a/src/mainboard/asus/dsbf/romstage.c b/src/mainboard/asus/dsbf/romstage.c index fbd0848f9b..d7bcb89554 100644 --- a/src/mainboard/asus/dsbf/romstage.c +++ b/src/mainboard/asus/dsbf/romstage.c @@ -32,8 +32,8 @@ #include #include #include -#include "northbridge/intel/i3100/i3100.h" -#include "southbridge/intel/i3100/i3100.h" +#include +#include #include #define DEVPRES_CONFIG (DEVPRES_D1F0 | DEVPRES_D2F0 | DEVPRES_D3F0) diff --git a/src/mainboard/asus/k8v-x/romstage.c b/src/mainboard/asus/k8v-x/romstage.c index dab3193d70..2f8dc4fb4e 100644 --- a/src/mainboard/asus/k8v-x/romstage.c +++ b/src/mainboard/asus/k8v-x/romstage.c @@ -34,16 +34,16 @@ unsigned int get_sbdn(unsigned bus); #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 "northbridge/amd/amdk8/early_ht.c" #include #include #include "southbridge/via/vt8237r/early_smbus.c" #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include @@ -74,7 +74,7 @@ void soft_reset(void) } #include "southbridge/via/k8t890/early_car.c" -#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.c" diff --git a/src/mainboard/asus/m2n-e/romstage.c b/src/mainboard/asus/m2n-e/romstage.c index d12b77c5be..4cf64cc571 100644 --- a/src/mainboard/asus/m2n-e/romstage.c +++ b/src/mainboard/asus/m2n-e/romstage.c @@ -31,15 +31,15 @@ #include #include #include "southbridge/nvidia/mcp55/early_smbus.c" -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" #include #include -#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/debug.c" #include "northbridge/amd/amdk8/setup_resource_map.c" #include "southbridge/nvidia/mcp55/early_ctrl.c" @@ -55,14 +55,14 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include "northbridge/amd/amdk8/f.h" +#include #include "northbridge/amd/amdk8/incoherent_ht.c" #include "northbridge/amd/amdk8/coherent_ht.c" #include "northbridge/amd/amdk8/raminit_f.c" #include "lib/generic_sdram.c" #include "resourcemap.c" #include "cpu/amd/dualcore/dualcore.c" -#include "southbridge/nvidia/mcp55/early_setup_ss.h" +#include #include "southbridge/nvidia/mcp55/early_setup_car.c" #include "cpu/amd/model_fxx/init_cpus.c" #include "cpu/amd/model_fxx/fidvid.c" diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c index 42b03c8a7a..87d0d713f3 100644 --- a/src/mainboard/asus/m2v-mx_se/romstage.c +++ b/src/mainboard/asus/m2v-mx_se/romstage.c @@ -35,14 +35,14 @@ unsigned int get_sbdn(unsigned bus); #include #include #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" #include #include #include "southbridge/via/vt8237r/early_smbus.c" -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include @@ -58,7 +58,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "southbridge/via/k8t890/early_car.c" -#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/asus/m2v/romstage.c b/src/mainboard/asus/m2v/romstage.c index f776351d14..f5c56549b6 100644 --- a/src/mainboard/asus/m2v/romstage.c +++ b/src/mainboard/asus/m2v/romstage.c @@ -35,14 +35,14 @@ unsigned int get_sbdn(unsigned bus); #include #include #include -#include "northbridge/amd/amdk8/raminit.h" +#include #include "lib/delay.c" #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" #include #include #include "southbridge/via/vt8237r/early_smbus.c" -#include "cpu/x86/bist.h" +#include #include "northbridge/amd/amdk8/setup_resource_map.c" #include @@ -61,7 +61,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) } #include "southbridge/via/k8t890/early_car.c" -#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/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c index 9da8c6c669..01df5c8cbe 100644 --- a/src/mainboard/asus/m4a78-em/romstage.c +++ b/src/mainboard/asus/m4a78-em/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, IT8712F_SP1) @@ -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/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c index dcf2b2215c..9b14cd355a 100644 --- a/src/mainboard/asus/m4a785-m/romstage.c +++ b/src/mainboard/asus/m4a785-m/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, IT8712F_SP1) @@ -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/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c index a2fcedad11..3bf8e80f36 100644 --- a/src/mainboard/asus/m5a88-v/romstage.c +++ b/src/mainboard/asus/m5a88-v/romstage.c @@ -35,12 +35,12 @@ #include #include #include -#include "northbridge/amd/amdfam10/raminit.h" -#include "northbridge/amd/amdfam10/amdfam10.h" -#include "cpu/x86/lapic.h" +#include +#include +#include #include "northbridge/amd/amdfam10/reset_test.c" #include -#include "cpu/x86/bist.h" +#include #include #include #include @@ -64,7 +64,7 @@ static int spd_read_byte(u32 device, u32 address) #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" #include "spd.h" diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c index 15d7791ca8..213d480146 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -24,10 +24,10 @@ #include #include #include -#include "southbridge/intel/i82801ax/i82801ax.h" -#include "northbridge/intel/i82810/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" -#include "cpu/x86/bist.h" +#include #include #include diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c index 3c67af3fdd..f6032efd53 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -25,9 +25,9 @@ #include #include #include -#include "northbridge/intel/i82810/raminit.h" -#include "cpu/x86/bist.h" -#include "southbridge/intel/i82801ax/i82801ax.h" +#include +#include +#include #include "drivers/pc80/udelay_io.c" #include diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c index 83073116ff..28e4e606a4 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include #include #include diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c index 56992c52d0..af226d51a1 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include #include #include diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c index 7cf009948f..e46ce61937 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */ #include diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index fb90a68a6a..dbc359aeab 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */ #include diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c index 16c9286e89..155a86d390 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include #include diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index 2655fc7a22..2636d4e19f 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -24,11 +24,11 @@ #include #include #include -#include "southbridge/intel/i82371eb/i82371eb.h" -#include "northbridge/intel/i440bx/raminit.h" +#include +#include #include "drivers/pc80/udelay_io.c" #include "lib/delay.c" -#include "cpu/x86/bist.h" +#include #include /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */ #include -- cgit v1.2.3