From 212d0a2eaefac97c55ad932e775be68a975fe164 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 13 Oct 2010 23:00:41 +0000 Subject: [PATCH] Remove various .c #includes from Intel i810/i82801ax/i82801bx boards. This is pretty much the same mechanism as in r5929. - Use 'romstage-y' to turn i82801ax_early_smbus.c and i82801bx_early_smbus.c into distinct compilation units, and don't #include the files anymore in romstage.c files. - Ditto for northbridge/intel/i82810/raminit.c, and northbridge/intel/i82810/debug.c. - Add various header files which are now needed, drop unused includes. - Make functions that need to be visible non-static. Abuild-tested. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5951 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/mew-am/romstage.c | 12 +++++------- src/mainboard/asus/mew-vm/romstage.c | 10 ++++------ src/mainboard/ecs/p6iwp-fe/romstage.c | 10 ++++------ src/mainboard/hp/e_vectra_p2706t/romstage.c | 9 +++++---- src/mainboard/intel/d810e2cb/romstage.c | 11 ++++------- src/mainboard/mitac/6513wu/romstage.c | 11 +++++------ src/mainboard/msi/ms6178/romstage.c | 13 +++++-------- src/mainboard/nec/powermate2000/romstage.c | 9 +++++---- src/northbridge/intel/i82810/Makefile.inc | 3 +++ src/northbridge/intel/i82810/debug.c | 4 +++- src/northbridge/intel/i82810/i82810.h | 7 +++++++ src/northbridge/intel/i82810/raminit.c | 12 +++++++++--- src/northbridge/intel/i82810/raminit.h | 8 +++++++- src/southbridge/intel/i82801ax/Makefile.inc | 2 ++ .../intel/i82801ax/i82801ax_early_smbus.c | 10 ++++++++-- src/southbridge/intel/i82801ax/i82801ax_smbus.h | 6 ++++-- src/southbridge/intel/i82801bx/Makefile.inc | 2 ++ .../intel/i82801bx/i82801bx_early_smbus.c | 10 ++++++++-- src/southbridge/intel/i82801bx/i82801bx_smbus.h | 5 +++-- 19 files changed, 93 insertions(+), 61 deletions(-) diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c index 402789c0a..aad5ed385 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -23,22 +23,20 @@ #include #include #include -#include #include #include -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "northbridge/intel/i82810/raminit.h" -#include "lib/debug.c" #include "pc80/udelay_io.c" -#include "lib/delay.c" #include "cpu/x86/bist.h" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" -#include "northbridge/intel/i82810/raminit.c" -/* #include "northbridge/intel/i82810/debug.c" */ #include #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); @@ -46,7 +44,7 @@ void main(unsigned long bist) console_init(); report_bist_failure(bist); enable_smbus(); - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c index e4c551eb6..87aca12f5 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -22,23 +22,21 @@ #include #include #include -#include #include #include #include #include "superio/smsc/lpc47b272/lpc47b272_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/bist.h" -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" -#include "lib/debug.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "pc80/udelay_io.c" -#include "lib/delay.c" -#include "northbridge/intel/i82810/raminit.c" -#include "northbridge/intel/i82810/debug.c" #include #define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c index b899d938a..a3c1f20af 100644 --- a/src/mainboard/ecs/p6iwp-fe/romstage.c +++ b/src/mainboard/ecs/p6iwp-fe/romstage.c @@ -24,20 +24,18 @@ #include #include #include -#include #include #include -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "northbridge/intel/i82810/raminit.h" -#include "lib/debug.c" #include "pc80/udelay_io.c" -#include "lib/delay.c" #include "cpu/x86/bist.h" #include "superio/ite/it8712f/it8712f_early_serial.c" -#include "northbridge/intel/i82810/raminit.c" -#include "northbridge/intel/i82810/debug.c" #include +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { it8712f_24mhz_clkin(); diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c index 39cb2669c..776b841b6 100644 --- a/src/mainboard/hp/e_vectra_p2706t/romstage.c +++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c @@ -31,15 +31,16 @@ /* TODO: It's i810E actually! */ #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/bist.h" -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "pc80/udelay_io.c" -#include "lib/debug.c" -#include "northbridge/intel/i82810/raminit.c" #include /* TODO: It's a PC87364 actually! */ #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { /* TODO: It's a PC87364 actually! */ @@ -48,7 +49,7 @@ void main(unsigned long bist) console_init(); enable_smbus(); report_bist_failure(bist); - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c index 94f117053..fcdbb3156 100644 --- a/src/mainboard/intel/d810e2cb/romstage.c +++ b/src/mainboard/intel/d810e2cb/romstage.c @@ -23,24 +23,21 @@ #include #include #include -#include #include #include #include "southbridge/intel/i82801bx/i82801bx.h" -#include "southbridge/intel/i82801bx/i82801bx_early_smbus.c" #include "northbridge/intel/i82810/raminit.h" -#include "lib/debug.c" #include "pc80/udelay_io.c" -#include "lib/delay.c" #include "cpu/x86/bist.h" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "gpio.c" -#include "northbridge/intel/i82810/raminit.c" -/* #include "northbridge/intel/i82810/debug.c" */ #include #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { /* Set southbridge and Super I/O GPIOs. */ @@ -52,7 +49,7 @@ void main(unsigned long bist) report_bist_failure(bist); enable_smbus(); - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c index 1a2d7c4f0..a46e5673f 100644 --- a/src/mainboard/mitac/6513wu/romstage.c +++ b/src/mainboard/mitac/6513wu/romstage.c @@ -23,22 +23,21 @@ #include #include #include -#include #include #include -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "northbridge/intel/i82810/raminit.h" -#include "lib/debug.c" #include "pc80/udelay_io.c" #include "lib/delay.c" #include "cpu/x86/bist.h" #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" -#include "northbridge/intel/i82810/raminit.c" -/* #include "northbridge/intel/i82810/debug.c" */ #include #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); @@ -47,7 +46,7 @@ void main(unsigned long bist) report_bist_failure(bist); enable_smbus(); - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c index 5aab983c5..30bddde5a 100644 --- a/src/mainboard/msi/ms6178/romstage.c +++ b/src/mainboard/msi/ms6178/romstage.c @@ -22,21 +22,21 @@ #include #include #include -#include #include #include #include #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/bist.h" -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "pc80/udelay_io.c" -#include "lib/debug.c" -#include "northbridge/intel/i82810/raminit.c" #include #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { /* FIXME */ @@ -48,12 +48,9 @@ void main(unsigned long bist) uart_init(); console_init(); - enable_smbus(); - report_bist_failure(bist); - - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c index 8f71cc9d4..0444b08d5 100644 --- a/src/mainboard/nec/powermate2000/romstage.c +++ b/src/mainboard/nec/powermate2000/romstage.c @@ -22,20 +22,21 @@ #include #include #include -#include #include #include #include #include "superio/smsc/smscsuperio/smscsuperio_early_serial.c" #include "northbridge/intel/i82810/raminit.h" #include "cpu/x86/bist.h" -#include "southbridge/intel/i82801ax/i82801ax_early_smbus.c" +#include "southbridge/intel/i82801ax/i82801ax.h" #include "pc80/udelay_io.c" -#include "northbridge/intel/i82810/raminit.c" #include #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +void enable_smbus(void); +int smbus_read_byte(u8 device, u8 address); + void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); @@ -43,7 +44,7 @@ void main(unsigned long bist) console_init(); enable_smbus(); report_bist_failure(bist); - /* dump_spd_registers(); */ + dump_spd_registers(); sdram_set_registers(); sdram_set_spd_registers(); sdram_enable(); diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc index 16d702a24..0c0a3c846 100644 --- a/src/northbridge/intel/i82810/Makefile.inc +++ b/src/northbridge/intel/i82810/Makefile.inc @@ -20,3 +20,6 @@ driver-y += northbridge.c +romstage-y += raminit.c +romstage-y += debug.c + diff --git a/src/northbridge/intel/i82810/debug.c b/src/northbridge/intel/i82810/debug.c index 55af01bc2..44ee19728 100644 --- a/src/northbridge/intel/i82810/debug.c +++ b/src/northbridge/intel/i82810/debug.c @@ -1,4 +1,6 @@ -static void dump_spd_registers(void) +#include "raminit.h" + +void dump_spd_registers(void) { #if CONFIG_DEBUG_RAM_SETUP int i; diff --git a/src/northbridge/intel/i82810/i82810.h b/src/northbridge/intel/i82810/i82810.h index 75d92cbbe..669575476 100644 --- a/src/northbridge/intel/i82810/i82810.h +++ b/src/northbridge/intel/i82810/i82810.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef NORTHBRIDGE_INTEL_I82810_I82810_H +#define NORTHBRIDGE_INTEL_I82810_I82810_H + /* * Datasheet: * - Name: Intel 810 Chipset: @@ -43,3 +46,7 @@ #define MISSC 0x72 /* Miscellaneous Control */ #define MISSC2 0x80 /* Miscellaneous Control 2 */ #define BUFF_SC 0x92 /* System Memory Buffer Strength Control */ + +int smbus_read_byte(u8 device, u8 address); + +#endif diff --git a/src/northbridge/intel/i82810/raminit.c b/src/northbridge/intel/i82810/raminit.c index 3ddc8a02e..83b21b128 100644 --- a/src/northbridge/intel/i82810/raminit.c +++ b/src/northbridge/intel/i82810/raminit.c @@ -22,7 +22,13 @@ #include #include +#include +#include +#include +#include +#include #include "i82810.h" +#include "raminit.h" /*----------------------------------------------------------------------------- Macros and definitions. @@ -421,7 +427,7 @@ static void set_dram_buffer_strength(void) Public interface. -----------------------------------------------------------------------------*/ -static void sdram_set_registers(void) +void sdram_set_registers(void) { u8 reg8; u16 did; @@ -454,7 +460,7 @@ static void sdram_set_registers(void) pci_write_config8(PCI_DEV(0, 0, 0), MISSC2, reg8); } -static void sdram_set_spd_registers(void) +void sdram_set_spd_registers(void) { spd_set_dram_size(); set_dram_buffer_strength(); @@ -464,7 +470,7 @@ static void sdram_set_spd_registers(void) /** * Enable SDRAM. */ -static void sdram_enable(void) +void sdram_enable(void) { int i; diff --git a/src/northbridge/intel/i82810/raminit.h b/src/northbridge/intel/i82810/raminit.h index f35832ecd..fbf64239b 100644 --- a/src/northbridge/intel/i82810/raminit.h +++ b/src/northbridge/intel/i82810/raminit.h @@ -27,4 +27,10 @@ /* DIMM0 is at 0x50, DIMM1 is at 0x51. */ #define DIMM_SPD_BASE 0x50 -#endif /* NORTHBRIDGE_INTEL_I82810_RAMINIT_H */ +/* Function prototypes. */ +void sdram_set_registers(void); +void sdram_set_spd_registers(void); +void sdram_enable(void); +void dump_spd_registers(void); + +#endif diff --git a/src/southbridge/intel/i82801ax/Makefile.inc b/src/southbridge/intel/i82801ax/Makefile.inc index 6d253f01f..a282dd1e3 100644 --- a/src/southbridge/intel/i82801ax/Makefile.inc +++ b/src/southbridge/intel/i82801ax/Makefile.inc @@ -29,3 +29,5 @@ driver-y += i82801ax_usb.c ramstage-y += i82801ax_reset.c ramstage-y += i82801ax_watchdog.c +romstage-y += i82801ax_early_smbus.c + diff --git a/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c b/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c index e51e6afb6..d30ed57e0 100644 --- a/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c +++ b/src/southbridge/intel/i82801ax/i82801ax_early_smbus.c @@ -20,11 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include #include +#include #include "i82801ax.h" #include "i82801ax_smbus.h" -static void enable_smbus(void) +int smbus_read_byte(u8 device, u8 address); + +void enable_smbus(void) { device_t dev; @@ -50,7 +56,7 @@ static void enable_smbus(void) print_debug("SMBus controller enabled\n"); } -static inline int smbus_read_byte(unsigned device, unsigned address) +int smbus_read_byte(u8 device, u8 address) { return do_smbus_read_byte(SMBUS_IO_BASE, device, address); } diff --git a/src/southbridge/intel/i82801ax/i82801ax_smbus.h b/src/southbridge/intel/i82801ax/i82801ax_smbus.h index 312d0b781..bf7a479a4 100644 --- a/src/southbridge/intel/i82801ax/i82801ax_smbus.h +++ b/src/southbridge/intel/i82801ax/i82801ax_smbus.h @@ -20,6 +20,9 @@ #include +void enable_smbus(void); +int do_smbus_read_byte(u16 smbus_io_base, u8 device, u8 address); + static void smbus_delay(void) { inb(0x80); @@ -51,8 +54,7 @@ static int smbus_wait_until_done(u16 smbus_io_base) return loops ? 0 : -1; } -static int do_smbus_read_byte(u16 smbus_io_base, unsigned device, - unsigned address) +int do_smbus_read_byte(u16 smbus_io_base, u8 device, u8 address) { unsigned char global_status_register; unsigned char byte; diff --git a/src/southbridge/intel/i82801bx/Makefile.inc b/src/southbridge/intel/i82801bx/Makefile.inc index cd9c1574a..313a0896d 100644 --- a/src/southbridge/intel/i82801bx/Makefile.inc +++ b/src/southbridge/intel/i82801bx/Makefile.inc @@ -30,3 +30,5 @@ driver-y += i82801bx_usb.c ramstage-y += i82801bx_reset.c ramstage-y += i82801bx_watchdog.c +romstage-y += i82801bx_early_smbus.c + diff --git a/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c b/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c index b7597716e..92a5403ed 100644 --- a/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c +++ b/src/southbridge/intel/i82801bx/i82801bx_early_smbus.c @@ -20,11 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include +#include #include +#include #include "i82801bx.h" #include "i82801bx_smbus.h" -static void enable_smbus(void) +int smbus_read_byte(u8 device, u8 address); + +void enable_smbus(void) { device_t dev; @@ -50,7 +56,7 @@ static void enable_smbus(void) print_debug("SMBus controller enabled\n"); } -static inline int smbus_read_byte(unsigned device, unsigned address) +int smbus_read_byte(u8 device, u8 address) { return do_smbus_read_byte(SMBUS_IO_BASE, device, address); } diff --git a/src/southbridge/intel/i82801bx/i82801bx_smbus.h b/src/southbridge/intel/i82801bx/i82801bx_smbus.h index 24c08cd35..066feade0 100644 --- a/src/southbridge/intel/i82801bx/i82801bx_smbus.h +++ b/src/southbridge/intel/i82801bx/i82801bx_smbus.h @@ -20,6 +20,8 @@ #include +void enable_smbus(void); + static void smbus_delay(void) { inb(0x80); @@ -51,8 +53,7 @@ static int smbus_wait_until_done(u16 smbus_io_base) return loops ? 0 : -1; } -static int do_smbus_read_byte(u16 smbus_io_base, unsigned device, - unsigned address) +static int do_smbus_read_byte(u16 smbus_io_base, u8 device, u8 address) { unsigned char global_status_register; unsigned char byte; -- 2.25.1