Arthur Heymans has uploaded a new change for review. ( https://review.coreboot.org/19653 )
Change subject: nb/amdk8/debug.c Fix building with CONFIG_DEBUG_SMBUS ......................................................................
nb/amdk8/debug.c Fix building with CONFIG_DEBUG_SMBUS
Problem was introduced by fb2f667da2 "nb/amd/amdk8: Link raminit_f.c" which linked debug.c and was not tested with this option.
Change-Id: I8597a6915c65ea783a864110cb23ecb34ea0611b Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/northbridge/amd/amdk8/debug.c M src/northbridge/amd/amdk8/raminit.h 2 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/19653/1
diff --git a/src/northbridge/amd/amdk8/debug.c b/src/northbridge/amd/amdk8/debug.c index e1eade4..69c3103 100644 --- a/src/northbridge/amd/amdk8/debug.c +++ b/src/northbridge/amd/amdk8/debug.c @@ -8,6 +8,7 @@ #include <arch/io.h> #include <device/pci_def.h> #include <delay.h> +#include "raminit.h"
void print_debug_addr(const char *str, void *val) { @@ -153,7 +154,7 @@ if ((j & 0xf) == 0) { printk(BIOS_DEBUG, "\n%02x: ", j); } - status = smbus_read_byte(device, j); + status = spd_read_byte(device, j); if (status < 0) { break; } @@ -172,7 +173,7 @@ if ((j & 0xf) == 0) { printk(BIOS_DEBUG, "\n%02x: ", j); } - status = smbus_read_byte(device, j); + status = spd_read_byte(device, j); if (status < 0) { break; } @@ -189,12 +190,13 @@ printk(BIOS_DEBUG, "\n"); for (device = 1; device < 0x80; device++) { int j; - if (smbus_read_byte(device, 0) < 0) continue; + if (spd_read_byte(device, 0) < 0) + continue; printk(BIOS_DEBUG, "smbus: %02x", device); for (j = 0; j < 256; j++) { int status; unsigned char byte; - status = smbus_read_byte(device, j); + status = spd_read_byte(device, j); if (status < 0) { break; } diff --git a/src/northbridge/amd/amdk8/raminit.h b/src/northbridge/amd/amdk8/raminit.h index 0f4636b..168b2ba 100644 --- a/src/northbridge/amd/amdk8/raminit.h +++ b/src/northbridge/amd/amdk8/raminit.h @@ -33,6 +33,8 @@ void sdram_set_registers(const struct mem_controller *ctrl, struct sys_info *sysinfo); void sdram_set_spd_registers(const struct mem_controller *ctrl, struct sys_info *sysinfo); +void dump_spd_registers(const struct mem_controller *ctrl); +void dump_smbus_registers(void); #else void sdram_set_registers(const struct mem_controller *ctrl); void sdram_set_spd_registers(const struct mem_controller *ctrl);