Merge git://git.denx.de/u-boot-marvell

[people/ms/u-boot.git] / arch / sandbox / cpu / cpu.c

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index e6ddb17a140381b59abd7d8b0c597eff8a18a57e..01991049ccf7773488328227e8c7ec0a46f5c994 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -4,10 +4,13 @@
  */
 #define DEBUG
 #include <common.h>
-#include <dm/root.h>
+#include <dm.h>
+#include <errno.h>
+#include <libfdt.h>
 #include <os.h>
 #include <asm/io.h>
 #include <asm/state.h>
+#include <dm/root.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -20,7 +23,7 @@ static struct udevice *map_dev;
 unsigned long map_len;
 #endif
 
-void reset_cpu(ulong ignored)
+void sandbox_exit(void)
 {
        /* Do this here while it still has an effect */
        os_fd_restore();
@@ -34,17 +37,13 @@ void reset_cpu(ulong ignored)
        os_exit(0);
 }
 
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       reset_cpu(0);
-
-       return 0;
-}
-
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
-       os_usleep(usec);
+       struct sandbox_state *state = state_get_current();
+
+       if (!state->skip_delays)
+               os_usleep(usec);
 }
 
 int cleanup_before_linux(void)
@@ -59,7 +58,7 @@ int cleanup_before_linux_select(int flags)
 
 void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 {
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && !defined(CONFIG_SPL_BUILD)
        unsigned long plen = len;
        void *ptr;
 
@@ -101,6 +100,10 @@ void flush_dcache_range(unsigned long start, unsigned long stop)
 {
 }
 
+void invalidate_dcache_range(unsigned long start, unsigned long stop)
+{
+}
+
 int sandbox_read_fdt_from_file(void)
 {
        struct sandbox_state *state = state_get_current();
@@ -140,3 +143,14 @@ done:
 
        return 0;
 }
+
+ulong timer_get_boot_us(void)
+{
+       static uint64_t base_count;
+       uint64_t count = os_get_nsec();
+
+       if (!base_count)
+               base_count = count;
+
+       return (count - base_count) / 1000;
+}