From 9fe4d797a37671a65053add3f7cca27397db0b9b Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 16 Jan 2010 17:53:38 +0000 Subject: coreboot used to have two different "APIs" for memory accesses: read32(unsigned long addr) vs readl(void *addr) and write32(unsigned long addr, uint32_t value) vs writel(uint32_t value, void *addr) read32 was only available in __PRE_RAM__ stage, while readl was used in stage2. Some unclean implementations then made readl available to __PRE_RAM__ too which results in really messy includes and code. This patch fixes all code to use the read32/write32 variant, so that we can remove readl/writel in another patch. Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5022 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/lib/console.c | 2 +- src/arch/i386/lib/printk_init.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/arch/i386/lib') diff --git a/src/arch/i386/lib/console.c b/src/arch/i386/lib/console.c index 2bab6032d3..b5d3c1bffe 100644 --- a/src/arch/i386/lib/console.c +++ b/src/arch/i386/lib/console.c @@ -10,7 +10,7 @@ #define COREBOOT_EXTRA_VERSION "" #endif -static void console_init(void) +void console_init(void) { static const char console_test[] = "\r\n\r\ncoreboot-" diff --git a/src/arch/i386/lib/printk_init.c b/src/arch/i386/lib/printk_init.c index f0ad2551bb..dd4672736b 100644 --- a/src/arch/i386/lib/printk_init.c +++ b/src/arch/i386/lib/printk_init.c @@ -18,6 +18,7 @@ */ #include +#include #include #include #include @@ -32,9 +33,6 @@ int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; #define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL #endif -void console_tx_byte(unsigned char byte); -int do_printk(int msg_level, const char *fmt, ...); - void console_tx_byte(unsigned char byte) { if (byte == '\n') -- cgit v1.2.3