libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

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

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 01991049ccf7773488328227e8c7ec0a46f5c994..2a1cad1b2f1850baf7ced8e7596e516f96da970a 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <os.h>
 #include <asm/io.h>
 #include <asm/state.h>
@@ -56,6 +56,16 @@ int cleanup_before_linux_select(int flags)
        return 0;
 }
 
+void *phys_to_virt(phys_addr_t paddr)
+{
+       return (void *)(gd->arch.ram_buf + paddr);
+}
+
+phys_addr_t virt_to_phys(void *vaddr)
+{
+       return (phys_addr_t)((uint8_t *)vaddr - gd->arch.ram_buf);
+}
+
 void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 {
 #if defined(CONFIG_PCI) && !defined(CONFIG_SPL_BUILD)
@@ -66,14 +76,14 @@ void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
        if (enable_pci_map && !pci_map_physmem(paddr, &len, &map_dev, &ptr)) {
                if (plen != len) {
                        printf("%s: Warning: partial map at %x, wanted %lx, got %lx\n",
-                              __func__, paddr, len, plen);
+                              __func__, (uint)paddr, len, plen);
                }
                map_len = len;
                return ptr;
        }
 #endif
 
-       return (void *)(gd->arch.ram_buf + paddr);
+       return phys_to_virt(paddr);
 }
 
 void unmap_physmem(const void *vaddr, unsigned long flags)