board_f: Move new_bloblist to boardf

This value is only used before relocation. Move it to the new boardf
struct.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_f.c b/common/board_f.c
index 0c24e3ae618719f86e59125bed92f954b6d9298c..eb74bfa428a76f9c0240ec7869906227f1982c2e 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -627,8 +627,8 @@ static int reserve_bloblist(void)
        /* Align to a 4KB boundary for easier reading of addresses */
        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);
+       gd->boardf->new_bloblist = map_sysmem(gd->start_addr_sp,
+                                             CONFIG_BLOBLIST_SIZE_RELOC);
 #endif
 
        return 0;
@@ -704,10 +704,11 @@ static int reloc_bloblist(void)
                debug("Not relocating bloblist\n");
                return 0;
        }
-       if (gd->new_bloblist) {
+       if (gd->boardf->new_bloblist) {
                debug("Copying bloblist from %p to %p, size %x\n",
-                     gd->bloblist, gd->new_bloblist, gd->bloblist->total_size);
-               return bloblist_reloc(gd->new_bloblist,
+                     gd->bloblist, gd->boardf->new_bloblist,
+       gd->bloblist->total_size);
+               return bloblist_reloc(gd->boardf->new_bloblist,
                                      CONFIG_BLOBLIST_SIZE_RELOC);
        }
 #endif

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 915dad503a2155ba30fcf992831b4a582ba813e9..544195391bd13fcbe38168261b241b9e66fe4889 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -395,10 +395,6 @@ struct global_data {
         * @bloblist: blob list information
         */
        struct bloblist_hdr *bloblist;
-       /**
-        * @new_bloblist: relocated blob list information
-        */
-       struct bloblist_hdr *new_bloblist;
 #endif
 #if CONFIG_IS_ENABLED(HANDOFF)
        /**

diff --git a/include/board_f.h b/include/board_f.h
index 1eba236a9614b83f22f2776a0bff29d079992dc6..05aa51510c251e250dacaf1b80f31ac2416e61b3 100644 (file)
--- a/include/board_f.h
+++ b/include/board_f.h
@@ -26,6 +26,10 @@ struct board_f {
         * @new_bootstage: relocated boot stage information
         */
        struct bootstage_data *new_bootstage;
+       /**
+        * @new_bloblist: relocated blob list information
+        */
+       struct bloblist_hdr *new_bloblist;
 };
 
 #endif