Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / arch / sandbox / cpu / cpu.c

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index e523223..fdfb209 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
  */
-#define DEBUG
+
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
@@ -105,8 +105,8 @@ void *phys_to_virt(phys_addr_t paddr)
        state = state_get_current();
        list_for_each_entry(mentry, &state->mapmem_head, sibling_node) {
                if (mentry->tag == paddr) {
-                       printf("%s: Used map from %lx to %p\n", __func__,
-                              (ulong)paddr, mentry->ptr);
+                       debug("%s: Used map from %lx to %p\n", __func__,
+                             (ulong)paddr, mentry->ptr);
                        return mentry->ptr;
                }
        }
@@ -152,7 +152,7 @@ phys_addr_t virt_to_phys(void *ptr)
                       __func__, ptr, (ulong)gd->ram_size);
                os_abort();
        }
-       printf("%s: Used map from %p to %lx\n", __func__, ptr, mentry->tag);
+       debug("%s: Used map from %p to %lx\n", __func__, ptr, mentry->tag);
 
        return mentry->tag;
 }
@@ -288,15 +288,3 @@ ulong timer_get_boot_us(void)
 
        return (count - base_count) / 1000;
 }
-
-int setjmp(jmp_buf jmp)
-{
-       return os_setjmp((ulong *)jmp, sizeof(*jmp));
-}
-
-void longjmp(jmp_buf jmp, int ret)
-{
-       os_longjmp((ulong *)jmp, ret);
-       while (1)
-               ;
-}