Merge branch '2022-01-08-further-important-updates'

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

diff --git a/common/board_f.c b/common/board_f.c
index ae3001b..f7ea7c7 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -49,6 +49,7 @@
 #if defined(CONFIG_MP) && defined(CONFIG_PPC)
 #include <asm/mp.h>
 #endif
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 #include <dm/root.h>
@@ -243,7 +244,7 @@ __weak int dram_init_banksize(void)
        return 0;
 }
 
-#if defined(CONFIG_SYS_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
 static int init_func_i2c(void)
 {
        puts("I2C:   ");
@@ -264,7 +265,9 @@ static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
        gd->mon_len = (ulong)&__bss_end - (ulong)_start;
-#elif defined(CONFIG_SANDBOX) || defined(CONFIG_EFI_APP)
+#elif defined(CONFIG_SANDBOX)
+       gd->mon_len = 0;
+#elif defined(CONFIG_EFI_APP)
        gd->mon_len = (ulong)&_end - (ulong)_init;
 #elif defined(CONFIG_NIOS2) || defined(CONFIG_XTENSA)
        gd->mon_len = CONFIG_SYS_MONITOR_LEN;
@@ -393,7 +396,7 @@ static int reserve_video(void)
        if (ret)
                return ret;
        debug("Reserving %luk for video at: %08lx\n",
-             (unsigned long)gd->relocaddr - addr, addr);
+             ((unsigned long)gd->relocaddr - addr) >> 10, addr);
        gd->relocaddr = addr;
 #elif defined(CONFIG_LCD)
 #  ifdef CONFIG_FB_ADDR
@@ -568,9 +571,10 @@ static int reserve_bloblist(void)
 {
 #ifdef CONFIG_BLOBLIST
        /* Align to a 4KB boundary for easier reading of addresses */
-       gd->start_addr_sp = ALIGN_DOWN(gd->start_addr_sp - CONFIG_BLOBLIST_SIZE,
-                                      0x1000);
-       gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE);
+       gd->start_addr_sp = ALIGN_DOWN(gd->start_addr_sp -
+                                      CONFIG_BLOBLIST_SIZE_RELOC, 0x1000);
+       gd->new_bloblist = map_sysmem(gd->start_addr_sp,
+                                     CONFIG_BLOBLIST_SIZE_RELOC);
 #endif
 
        return 0;
@@ -658,7 +662,8 @@ static int reloc_bloblist(void)
 
                debug("Copying bloblist from %p to %p, size %x\n",
                      gd->bloblist, gd->new_bloblist, size);
-               memcpy(gd->new_bloblist, gd->bloblist, size);
+               bloblist_reloc(gd->new_bloblist, CONFIG_BLOBLIST_SIZE_RELOC,
+                              gd->bloblist, size);
                gd->bloblist = gd->new_bloblist;
        }
 #endif
@@ -668,30 +673,32 @@ static int reloc_bloblist(void)
 
 static int setup_reloc(void)
 {
-       if (gd->flags & GD_FLG_SKIP_RELOC) {
-               debug("Skipping relocation due to flag\n");
-               return 0;
-       }
-
+       if (!(gd->flags & GD_FLG_SKIP_RELOC)) {
 #ifdef CONFIG_SYS_TEXT_BASE
 #ifdef ARM
-       gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
+               gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
 #elif defined(CONFIG_M68K)
-       /*
-        * On all ColdFire arch cpu, monitor code starts always
-        * just after the default vector table location, so at 0x400
-        */
-       gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
+               /*
+                * On all ColdFire arch cpu, monitor code starts always
+                * just after the default vector table location, so at 0x400
+                */
+               gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
 #elif !defined(CONFIG_SANDBOX)
-       gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
+               gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #endif
 #endif
+       }
+
        memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
 
-       debug("Relocation Offset is: %08lx\n", gd->reloc_off);
-       debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
-             gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd),
-             gd->start_addr_sp);
+       if (gd->flags & GD_FLG_SKIP_RELOC) {
+               debug("Skipping relocation due to flag\n");
+       } else {
+               debug("Relocation Offset is: %08lx\n", gd->reloc_off);
+               debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
+                     gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd),
+                     gd->start_addr_sp);
+       }
 
        return 0;
 }
@@ -866,7 +873,7 @@ static const init_fnc_t init_sequence_f[] = {
        misc_init_f,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_SYS_I2C)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
        init_func_i2c,
 #endif
 #if defined(CONFIG_VID) && !defined(CONFIG_SPL)