diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-04-22 13:18:09 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-04-22 13:18:09 +0000 |
| commit | 64d3baf9829baf9285c94cae0406ee0f428c04c0 (patch) | |
| tree | b80df0a87ad9bfecd2e6b2913eb5ff80535aee04 /src/southbridge | |
| parent | 4292685f5adbe45bb5b23f32c3b6aaed04187f48 (diff) | |
| download | coreboot-64d3baf9829baf9285c94cae0406ee0f428c04c0.tar.xz | |
zero warnings days...
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5477 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/via/k8t890/k8t890.h | 7 | ||||
| -rw-r--r-- | src/southbridge/via/k8t890/k8t890_early_car.c | 8 | ||||
| -rw-r--r-- | src/southbridge/via/vt8237r/vt8237r.h | 13 |
3 files changed, 21 insertions, 7 deletions
diff --git a/src/southbridge/via/k8t890/k8t890.h b/src/southbridge/via/k8t890/k8t890.h index 139daf91c2..ce60d904cc 100644 --- a/src/southbridge/via/k8t890/k8t890.h +++ b/src/southbridge/via/k8t890/k8t890.h @@ -38,14 +38,17 @@ /* the FB size in MB (min is 8MB max is 512MB) */ #define K8M890_FBSIZEMB 64 +#ifdef __PRE_RAM__ +u8 k8t890_early_setup_ht(void); +#else #include <device/device.h> - #if 0 extern void writeback(struct device *dev, u16 where, u8 what); extern void dump_south(device_t dev); #endif -#include <southbridge/via/vt8237r/vt8237r.h> +#endif +#include <southbridge/via/vt8237r/vt8237r.h> int k8m890_host_fb_size_get(void); //void k8m890_host_fb_direct_set(uint32_t fb_address); diff --git a/src/southbridge/via/k8t890/k8t890_early_car.c b/src/southbridge/via/k8t890/k8t890_early_car.c index 7c6a0ba16d..0505a6ff5a 100644 --- a/src/southbridge/via/k8t890/k8t890_early_car.c +++ b/src/southbridge/via/k8t890/k8t890_early_car.c @@ -23,12 +23,12 @@ */ #include <stdlib.h> -//include "k8t890.h" -#warning hack the right header here +#include "k8t890.h" /* The 256 bytes of NVRAM for S3 storage, 256B aligned */ #define K8T890_NVRAM_IO_BASE 0xf00 #define K8T890_MULTIPLE_FN_EN 0x4f + /* we provide S3 NVRAM to system */ #define S3_NVRAM_EARLY 1 @@ -113,7 +113,7 @@ u8 k8t890_early_setup_ht(void) return 1; } -int s3_save_nvram_early(u32 dword, int size, int nvram_pos) +static int s3_save_nvram_early(u32 dword, int size, int nvram_pos) { printk(BIOS_DEBUG, "Writing %x of size %d to nvram pos: %d\n", dword, size, nvram_pos); @@ -134,7 +134,7 @@ int s3_save_nvram_early(u32 dword, int size, int nvram_pos) return nvram_pos; } -int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) +static int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) { switch (size) { case 1: diff --git a/src/southbridge/via/vt8237r/vt8237r.h b/src/southbridge/via/vt8237r/vt8237r.h index d6c50053a6..54a46f8a72 100644 --- a/src/southbridge/via/vt8237r/vt8237r.h +++ b/src/southbridge/via/vt8237r/vt8237r.h @@ -103,7 +103,18 @@ __attribute__ ((packed)) #endif ; -#ifndef __PRE_RAM__ +#ifdef __PRE_RAM__ +#ifndef __ROMCC__ +u8 smbus_read_byte(u8 dimm, u8 offset); +void enable_smbus(void); +void smbus_fixup(const struct mem_controller *ctrl); +// these are in vt8237_early_smbus.c - do they really belong there? +void vt8237_sb_enable_fid_vid(void); +void enable_rom_decode(void); +void vt8237_early_spi_init(void); +int vt8237_early_network_init(struct vt8237_network_rom *rom); +#endif +#else #include <device/device.h> void writeback(struct device *dev, u16 where, u8 what); void dump_south(device_t dev); |