Author: stepan Date: Wed Mar 31 00:03:10 2010 New Revision: 5336 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5336
Log: fix some amd k8 warnings
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/northbridge/amd/amdk8/amdk8_f.h trunk/src/northbridge/amd/amdk8/util.c
Modified: trunk/src/northbridge/amd/amdk8/amdk8_f.h ============================================================================== --- trunk/src/northbridge/amd/amdk8/amdk8_f.h Tue Mar 30 23:52:05 2010 (r5335) +++ trunk/src/northbridge/amd/amdk8/amdk8_f.h Wed Mar 31 00:03:10 2010 (r5336) @@ -518,11 +518,7 @@ uint32_t sbbusn; } __attribute__((packed));
-#ifdef __PRE_RAM__ -static void soft_reset(void); -#else -void hard_reset(void); -#endif +#include <reset.h>
static void wait_all_core0_mem_trained(struct sys_info *sysinfo) {
Modified: trunk/src/northbridge/amd/amdk8/util.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/util.c Tue Mar 30 23:52:05 2010 (r5335) +++ trunk/src/northbridge/amd/amdk8/util.c Wed Mar 31 00:03:10 2010 (r5336) @@ -122,7 +122,7 @@ */ static void showdram(int level, u8 which, u32 base, u32 lim) { - do_printk(level, "DRAM(%02x)%010llx-%010llx, ->(%d), %s, %s, %s, %d\n", + printk(level, "DRAM(%02x)%010llx-%010llx, ->(%d), %s, %s, %s, %d\n", which, (((u64) base & 0xffff0000) << 8), (((u64) lim & 0xffff0000) << 8) + 0xffffff, r_node(lim), re(base), we(base), ileave(base), (lim >> 8) & 3); @@ -141,7 +141,7 @@ static void showconfig(int level, u8 which, u32 reg) { /* Don't use r_node() and r_link() here. */ - do_printk(level, "CONFIG(%02x)%02x-%02x ->(%d,%d),%s %s (%s numbers)\n", + printk(level, "CONFIG(%02x)%02x-%02x ->(%d,%d),%s %s (%s numbers)\n", which, BITS(reg, 16, 0xff), BITS(reg, 24, 0xff), BITS(reg, 4, 0x7), BITS(reg, 8, 0x3), re(reg), we(reg), @@ -161,7 +161,7 @@ */ static void showpciio(int level, u8 which, u32 base, u32 lim) { - do_printk(level, "PCIIO(%02x)%07x-%07x, ->(%d,%d), %s, %s,VGA %d ISA %d\n", + printk(level, "PCIIO(%02x)%07x-%07x, ->(%d,%d), %s, %s,VGA %d ISA %d\n", which, BITS(base, 12, 0x3fff) << 12, (BITS(lim, 12, 0x3fff) << 12) + 0xfff, r_node(lim), r_link(lim), re(base), we(base), BITS(base, 4, 0x1), BITS(base, 5, 0x1)); @@ -180,7 +180,7 @@ */ static void showmmio(int level, u8 which, u32 base, u32 lim) { - do_printk(level, "MMIO(%02x)%010llx-%010llx, ->(%d,%d), %s, %s, " + printk(level, "MMIO(%02x)%010llx-%010llx, ->(%d,%d), %s, %s, " "CPU disable %d, Lock %d, Non posted %d\n", which, ((u64) BITS(base, 0, 0xffffff00)) << 8, (((u64) BITS(lim, 0, 0xffffff00)) << 8) + 0xffff, r_node(lim),