summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cbmem.c2
-rw-r--r--src/lib/fallback_boot.c4
-rw-r--r--src/lib/ramtest.c16
3 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index db761958a9..92a848497d 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -184,7 +184,7 @@ void cbmem_initialize(void)
if (acpi_slp_type == 3) {
if (!cbmem_reinit(high_tables_base)) {
/* Something went wrong, our high memory area got wiped */
- acpi_slp_type == 0;
+ acpi_slp_type = 0;
cbmem_init(high_tables_base, high_tables_size);
}
} else {
diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c
index b969b6b5cf..e2da65cf91 100644
--- a/src/lib/fallback_boot.c
+++ b/src/lib/fallback_boot.c
@@ -1,6 +1,6 @@
#include <console/console.h>
-#include <part/fallback_boot.h>
-#include <part/watchdog.h>
+#include <fallback.h>
+#include <watchdog.h>
#include <pc80/mc146818rtc.h>
#include <arch/io.h>
diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c
index 9f329ef51b..4f00030b89 100644
--- a/src/lib/ramtest.c
+++ b/src/lib/ramtest.c
@@ -30,7 +30,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
* Fill.
*/
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("DRAM fill: 0x%08x-0x%08x\r\n", start, stop);
+ printk_debug("DRAM fill: 0x%08lx-0x%08lx\r\n", start, stop);
#else
print_debug("DRAM fill: ");
print_debug_hex32(start);
@@ -42,7 +42,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
/* Display address being filled */
if (!(addr & 0xfffff)) {
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%08x \r", addr);
+ printk_debug("%08lx \r", addr);
#else
print_debug_hex32(addr);
print_debug(" \r");
@@ -52,7 +52,7 @@ static void ram_fill(unsigned long start, unsigned long stop)
};
/* Display final address */
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%08x\r\nDRAM filled\r\n", addr);
+ printk_debug("%08lx\r\nDRAM filled\r\n", addr);
#else
print_debug_hex32(addr);
print_debug("\r\nDRAM filled\r\n");
@@ -67,7 +67,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
* Verify.
*/
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("DRAM verify: 0x%08x-0x%08x\r\n", start, stop);
+ printk_debug("DRAM verify: 0x%08lx-0x%08lx\r\n", start, stop);
#else
print_debug("DRAM verify: ");
print_debug_hex32(start);
@@ -80,7 +80,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
/* Display address being tested */
if (!(addr & 0xfffff)) {
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%08x \r", addr);
+ printk_debug("%08lx \r", addr);
#else
print_debug_hex32(addr);
print_debug(" \r");
@@ -90,7 +90,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
if (value != addr) {
/* Display address with error */
#if CONFIG_USE_PRINTK_IN_CAR
- printk_err("Fail: @0x%08x Read value=0x%08x\r\n", addr, value);
+ printk_err("Fail: @0x%08lx Read value=0x%08lx\r\n", addr, value);
#else
print_err("Fail: @0x");
print_err_hex32(addr);
@@ -111,7 +111,7 @@ static void ram_verify(unsigned long start, unsigned long stop)
}
/* Display final address */
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%08x", addr);
+ printk_debug("%08lx", addr);
#else
print_debug_hex32(addr);
#endif
@@ -142,7 +142,7 @@ void ram_check(unsigned long start, unsigned long stop)
* are tested. -Tyson
*/
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("Testing DRAM : %08x - %08x\r\n", start, stop);
+ printk_debug("Testing DRAM : %08lx - %08lx\r\n", start, stop);
#else
print_debug("Testing DRAM : ");
print_debug_hex32(start);