ARM: da850evm: Pinctrl for da850evm

[thirdparty/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index ae8bdb7c5c0c577df2d1999603bc5224f8318a97..213d0440667f871812d039ba03061058662bebc4 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
  * (C) Copyright 2002-2006
@@ -6,14 +7,13 @@
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <mgroeger@sysgo.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <console.h>
-#include <environment.h>
+#include <cpu.h>
 #include <dm.h>
+#include <environment.h>
 #include <fdtdec.h>
 #include <fs.h>
 #include <i2c.h>
@@ -25,6 +25,7 @@
 #include <relocate.h>
 #include <spi.h>
 #include <status_led.h>
+#include <sysreset.h>
 #include <timer.h>
 #include <trace.h>
 #include <video.h>
@@ -141,6 +142,57 @@ static int display_text_info(void)
        return 0;
 }
 
+#ifdef CONFIG_SYSRESET
+static int print_resetinfo(void)
+{
+       struct udevice *dev;
+       char status[256];
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_SYSRESET, &dev);
+       if (ret) {
+               debug("%s: No sysreset device found (error: %d)\n",
+                     __func__, ret);
+               /* Not all boards have sysreset drivers available during early
+                * boot, so don't fail if one can't be found.
+                */
+               return 0;
+       }
+
+       if (!sysreset_get_status(dev, status, sizeof(status)))
+               printf("%s", status);
+
+       return 0;
+}
+#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO) && CONFIG_IS_ENABLED(CPU)
+static int print_cpuinfo(void)
+{
+       struct udevice *dev;
+       char desc[512];
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_CPU, &dev);
+       if (ret) {
+               debug("%s: Could not get CPU device (err = %d)\n",
+                     __func__, ret);
+               return ret;
+       }
+
+       ret = cpu_get_desc(dev, desc, sizeof(desc));
+       if (ret) {
+               debug("%s: Could not get CPU description (err = %d)\n",
+                     dev->name, ret);
+               return ret;
+       }
+
+       printf("%s", desc);
+
+       return 0;
+}
+#endif
+
 static int announce_dram_init(void)
 {
        puts("DRAM:  ");
@@ -282,9 +334,9 @@ static int setup_dest_addr(void)
        gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE;
 #endif
 #ifdef CONFIG_SYS_SDRAM_BASE
-       gd->ram_top = CONFIG_SYS_SDRAM_BASE;
+       gd->ram_base = CONFIG_SYS_SDRAM_BASE;
 #endif
-       gd->ram_top += get_effective_memsize();
+       gd->ram_top = gd->ram_base + get_effective_memsize();
        gd->ram_top = board_get_usable_ram_top(gd->mon_len);
        gd->relocaddr = gd->ram_top;
        debug("Ram top: %08lX\n", (ulong)gd->ram_top);
@@ -395,19 +447,21 @@ static int reserve_trace(void)
 
 static int reserve_uboot(void)
 {
-       /*
-        * reserve memory for U-Boot code, data & bss
-        * round down to next 4 kB limit
-        */
-       gd->relocaddr -= gd->mon_len;
-       gd->relocaddr &= ~(4096 - 1);
-#if defined(CONFIG_E500) || defined(CONFIG_MIPS)
-       /* round down to next 64 kB limit so that IVPR stays aligned */
-       gd->relocaddr &= ~(65536 - 1);
-#endif
-
-       debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10,
-             gd->relocaddr);
+       if (!(gd->flags & GD_FLG_SKIP_RELOC)) {
+               /*
+                * reserve memory for U-Boot code, data & bss
+                * round down to next 4 kB limit
+                */
+               gd->relocaddr -= gd->mon_len;
+               gd->relocaddr &= ~(4096 - 1);
+       #if defined(CONFIG_E500) || defined(CONFIG_MIPS)
+               /* round down to next 64 kB limit so that IVPR stays aligned */
+               gd->relocaddr &= ~(65536 - 1);
+       #endif
+
+               debug("Reserving %ldk for U-Boot at: %08lx\n",
+                     gd->mon_len >> 10, gd->relocaddr);
+       }
 
        gd->start_addr_sp = gd->relocaddr;
 
@@ -789,6 +843,9 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_PPC) || defined(CONFIG_SH) || defined(CONFIG_X86)
        checkcpu,
 #endif
+#if defined(CONFIG_SYSRESET)
+       print_resetinfo,
+#endif
 #if defined(CONFIG_DISPLAY_CPUINFO)
        print_cpuinfo,          /* display cpu info (and speed) */
 #endif