sandbox: Move ram_buf to arch_global_data

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

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 554cae85ef05874221cd38f9e59edf65bb8a51fd..b2788d5d536280a55733d3b43a764eb05bb3c7b1 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -20,27 +20,26 @@
  */
 
 #include <common.h>
+#include <os.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       /*
-        * This is considered normal termination for now. We wil call os_exit()
-        * when available.
-        */
+       /* This is considered normal termination for now */
+       os_exit(0);
        return 0;
 }
 
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {
-       /* Ignore this for now */
+       os_usleep(usec);
 }
 
 unsigned long timer_get_us(void)
 {
-       return 0;
+       return os_get_nsec() / 1000;
 }
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
@@ -55,7 +54,7 @@ int cleanup_before_linux(void)
 
 void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 {
-       return (void *)(gd->ram_buf + paddr);
+       return (void *)(gd->arch.ram_buf + paddr);
 }
 
 void flush_dcache_range(unsigned long start, unsigned long stop)