socfpga: implement arria V socdk SPI flash config in dts

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

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 38019e0b48e57585b0e89f23ab929c9cad5f2edc..f0dafedc254fb5d0ca3973946539babf7a75d267 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -2,18 +2,31 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  * SPDX-License-Identifier:    GPL-2.0+
  */
-
+#define DEBUG
 #include <common.h>
+#include <dm/root.h>
 #include <os.h>
 #include <asm/state.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* Enable access to PCI memory with map_sysmem() */
+static bool enable_pci_map;
+
+#ifdef CONFIG_PCI
+/* Last device that was mapped into memory, and length of mapping */
+static struct udevice *map_dev;
+unsigned long map_len;
+#endif
+
 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);
 }
@@ -36,29 +49,47 @@ unsigned long __attribute__((no_instrument_function)) timer_get_us(void)
        return os_get_nsec() / 1000;
 }
 
-int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+int cleanup_before_linux(void)
 {
-       if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
-               bootstage_mark(BOOTSTAGE_ID_RUN_OS);
-               printf("## Transferring control to Linux (at address %08lx)...\n",
-                      images->ep);
-               reset_cpu(0);
+       return 0;
+}
+
+void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
+{
+#ifdef CONFIG_PCI
+       unsigned long plen = len;
+       void *ptr;
+
+       map_dev = NULL;
+       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);
+               }
+               map_len = len;
+               return ptr;
        }
+#endif
 
-       return 0;
+       return (void *)(gd->arch.ram_buf + paddr);
 }
 
-int cleanup_before_linux(void)
+void unmap_physmem(const void *vaddr, unsigned long flags)
 {
-       return 0;
+#ifdef CONFIG_PCI
+       if (map_dev) {
+               pci_unmap_physmem(vaddr, map_len, map_dev);
+               map_dev = NULL;
+       }
+#endif
 }
 
-void *map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
+void sandbox_set_enable_pci_map(int enable)
 {
-       return (void *)(gd->arch.ram_buf + paddr);
+       enable_pci_map = enable;
 }
 
-phys_addr_t map_to_sysmem(void *ptr)
+phys_addr_t map_to_sysmem(const void *ptr)
 {
        return (u8 *)ptr - gd->arch.ram_buf;
 }