From 212d0a2eaefac97c55ad932e775be68a975fe164 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 13 Oct 2010 23:00:41 +0000 Subject: 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/southbridge/intel/i82801bx/Makefile.inc | 2 ++ src/southbridge/intel/i82801bx/i82801bx_early_smbus.c | 10 ++++++++-- src/southbridge/intel/i82801bx/i82801bx_smbus.h | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/southbridge/intel/i82801bx') diff --git a/src/southbridge/intel/i82801bx/Makefile.inc b/src/southbridge/intel/i82801bx/Makefile.inc index cd9c1574a2..313a0896df 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 b7597716e7..92a5403edd 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 24c08cd357..066feade07 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; -- cgit v1.2.3