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

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

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 38019e0b48e57585b0e89f23ab929c9cad5f2edc..1aa397c5e773d8403293786838df63c7b539fa94 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <dm/root.h>
 #include <os.h>
 #include <asm/state.h>
 
@@ -14,6 +15,9 @@ void reset_cpu(ulong ignored)
        if (state_uninit())
                os_exit(2);
 
+       if (dm_uninit())
+               os_exit(2);
+
        /* This is considered normal termination for now */
        os_exit(0);
 }
@@ -58,7 +62,7 @@ void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
        return (void *)(gd->arch.ram_buf + paddr);
 }
 
-phys_addr_t map_to_sysmem(void *ptr)
+phys_addr_t map_to_sysmem(const void *ptr)
 {
        return (u8 *)ptr - gd->arch.ram_buf;
 }