summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2017-05-10 16:28:38 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2017-06-28 00:50:08 +0000
commit8eb55bbfe7e3bd601c4bece24e0772dba5410827 (patch)
tree42209df29cb13dc5f07896eeca4dcc243a9455a5 /src
parent4988af8ca8f3323a5a6b63a0b83ebda1fc2d2a81 (diff)
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> Reviewed-on: https://review.coreboot.org/19653 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Swift Geek <swiftgeek@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/northbridge/amd/amdk8/debug.c10
-rw-r--r--src/northbridge/amd/amdk8/raminit.h2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/northbridge/amd/amdk8/debug.c b/src/northbridge/amd/amdk8/debug.c
index e1eade4265..69c3103488 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 @@ void dump_spd_registers(const struct mem_controller *ctrl)
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 @@ void dump_spd_registers(const struct mem_controller *ctrl)
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 @@ void dump_smbus_registers(void)
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 0f4636b43e..168b2ba196 100644
--- a/src/northbridge/amd/amdk8/raminit.h
+++ b/src/northbridge/amd/amdk8/raminit.h
@@ -33,6 +33,8 @@ void sdram_enable(int controllers, const struct mem_controller *ctrl,
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);