Merge git://git.denx.de/u-boot-riscv

[platform/kernel/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 3871839..835b724 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -10,9 +10,11 @@
  */
 
 #include <common.h>
+#include <bloblist.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>
@@ -23,6 +25,9 @@
 #include <post.h>
 #include <relocate.h>
 #include <spi.h>
+#ifdef CONFIG_SPL
+#include <spl.h>
+#endif
 #include <status_led.h>
 #include <sysreset.h>
 #include <timer.h>
@@ -90,7 +95,7 @@ static int init_func_watchdog_init(void)
 {
 # if defined(CONFIG_HW_WATCHDOG) && \
        (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
-       defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \
+       defined(CONFIG_SH) || \
        defined(CONFIG_DESIGNWARE_WATCHDOG) || \
        defined(CONFIG_IMX_WATCHDOG))
        hw_watchdog_init();
@@ -165,6 +170,33 @@ static int print_resetinfo(void)
 }
 #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("CPU:   %s\n", desc);
+
+       return 0;
+}
+#endif
+
 static int announce_dram_init(void)
 {
        puts("DRAM:  ");
@@ -257,6 +289,17 @@ static int setup_mon_len(void)
        return 0;
 }
 
+static int setup_spl_handoff(void)
+{
+#if CONFIG_IS_ENABLED(HANDOFF)
+       gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF,
+                                       sizeof(struct spl_handoff));
+       debug("Found SPL hand-off info %p\n", gd->spl_handoff);
+#endif
+
+       return 0;
+}
+
 __weak int arch_cpu_init(void)
 {
        return 0;
@@ -532,6 +575,16 @@ static int reserve_stacks(void)
        return arch_reserve_stacks();
 }
 
+static int reserve_bloblist(void)
+{
+#ifdef CONFIG_BLOBLIST
+       gd->start_addr_sp -= CONFIG_BLOBLIST_SIZE;
+       gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE);
+#endif
+
+       return 0;
+}
+
 static int display_new_sp(void)
 {
        debug("New Stack Pointer is: %08lx\n", gd->start_addr_sp);
@@ -638,6 +691,24 @@ static int reloc_bootstage(void)
        return 0;
 }
 
+static int reloc_bloblist(void)
+{
+#ifdef CONFIG_BLOBLIST
+       if (gd->flags & GD_FLG_SKIP_RELOC)
+               return 0;
+       if (gd->new_bloblist) {
+               int size = CONFIG_BLOBLIST_SIZE;
+
+               debug("Copying bloblist from %p to %p, size %x\n",
+                     gd->bloblist, gd->new_bloblist, size);
+               memcpy(gd->new_bloblist, gd->bloblist, size);
+               gd->bloblist = gd->new_bloblist;
+       }
+#endif
+
+       return 0;
+}
+
 static int setup_reloc(void)
 {
        if (gd->flags & GD_FLG_SKIP_RELOC) {
@@ -785,6 +856,10 @@ static const init_fnc_t init_sequence_f[] = {
        initf_malloc,
        log_init,
        initf_bootstage,        /* uses its own timer, so does not need DM */
+#ifdef CONFIG_BLOBLIST
+       bloblist_init,
+#endif
+       setup_spl_handoff,
        initf_console_record,
 #if defined(CONFIG_HAVE_FSP)
        arch_fsp_init,
@@ -885,6 +960,7 @@ static const init_fnc_t init_sequence_f[] = {
        reserve_global_data,
        reserve_fdt,
        reserve_bootstage,
+       reserve_bloblist,
        reserve_arch,
        reserve_stacks,
        dram_init_banksize,
@@ -904,6 +980,7 @@ static const init_fnc_t init_sequence_f[] = {
        INIT_FUNC_WATCHDOG_RESET
        reloc_fdt,
        reloc_bootstage,
+       reloc_bloblist,
        setup_reloc,
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
        copy_uboot_to_ram,