Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 168f2efa33e5fe4f5eaab52503dbb724fd2f5528..3fe99b853d573bce6a81394c22c7c5655250d9ec 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,8 +23,10 @@ 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();
        if (state_uninit())
                os_exit(2);
 
@@ -32,32 +37,28 @@ 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);
 }
 
-unsigned long __attribute__((no_instrument_function)) timer_get_us(void)
+int cleanup_before_linux(void)
 {
-       return os_get_nsec() / 1000;
+       return 0;
 }
 
-int cleanup_before_linux(void)
+int cleanup_before_linux_select(int flags)
 {
        return 0;
 }
 
 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;