summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-01-26 14:44:18 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-11 21:54:34 +0100
commit972d5cf040aebbb8052767a4a88ad99a961ad2bf (patch)
treeff06c3b5adfc9e6826bd7e67690e3f7a05e5534d /src
parent4d77ed9d99af5442d9fce889ce2199de773c4f08 (diff)
downloadcoreboot-972d5cf040aebbb8052767a4a88ad99a961ad2bf.tar.xz
Move hexdump32() to lib/hexdump.
Needs printk and is not a console core function. Change-Id: Id90a363eca133af4469663c1e8b504baa70471e0 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5155 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/console/console.c20
-rw-r--r--src/include/console/console.h1
-rw-r--r--src/include/lib.h1
-rw-r--r--src/lib/hexdump.c16
-rw-r--r--src/northbridge/intel/fsp_sandybridge/fsp_util.c1
5 files changed, 18 insertions, 21 deletions
diff --git a/src/console/console.c b/src/console/console.c
index a31e293af4..38ac3e7d35 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -137,23 +137,3 @@ void console_init(void)
#endif /* CONFIG_EARLY_CONSOLE */
}
#endif
-
-#ifndef __ROMCC__
-void hexdump32(char LEVEL, const void *d, int len)
-{
- int count=0;
-
- while (len > 0) {
- if (count % 8 == 0) {
- printk(LEVEL,"\n");
- printk(LEVEL, "%p:", d);
- }
- printk(LEVEL, " 0x%08lx", *(unsigned long*)d);
- count++;
- len--;
- d += 4;
- }
-
- printk(LEVEL,"\n\n");
-}
-#endif /* !__ROMCC__ */
diff --git a/src/include/console/console.h b/src/include/console/console.h
index c5f5297f59..6fa624c799 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -86,7 +86,6 @@ void post_log_clear(void);
void mainboard_post(u8 value);
void __attribute__ ((noreturn)) die(const char *msg);
int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
-void hexdump32(char LEVEL, const void *d, int len);
#if defined(__BOOT_BLOCK__) && !CONFIG_BOOTBLOCK_CONSOLE || \
(defined(__PRE_RAM__) && !defined(__BOOT_BLOCK__)) && !CONFIG_EARLY_CONSOLE
diff --git a/src/include/lib.h b/src/include/lib.h
index bfa68e2eae..db2e9c776e 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -60,5 +60,6 @@ void post_cache_as_ram(void);
/* Defined in src/lib/hexdump.c */
void hexdump(const void *memory, size_t length);
+void hexdump32(char LEVEL, const void *d, int len);
#endif /* __LIB_H__ */
diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c
index 82b0a3ba5b..61009203eb 100644
--- a/src/lib/hexdump.c
+++ b/src/lib/hexdump.c
@@ -62,4 +62,20 @@ void hexdump(const void* memory, size_t length)
}
}
+void hexdump32(char LEVEL, const void *d, int len)
+{
+ int count=0;
+
+ while (len > 0) {
+ if (count % 8 == 0) {
+ printk(LEVEL,"\n");
+ printk(LEVEL, "%p:", d);
+ }
+ printk(LEVEL, " 0x%08lx", *(unsigned long*)d);
+ count++;
+ len--;
+ d += 4;
+ }
+ printk(LEVEL,"\n\n");
+}
diff --git a/src/northbridge/intel/fsp_sandybridge/fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp_util.c
index a8738a4358..a653747e1e 100644
--- a/src/northbridge/intel/fsp_sandybridge/fsp_util.c
+++ b/src/northbridge/intel/fsp_sandybridge/fsp_util.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <cpu/x86/stack.h>
#include <console/console.h>
+#include <lib.h>
#include "fsp_util.h"
#if CONFIG_ENABLE_FAST_BOOT