[PATCH 20/35] board_f: Move new_bloblist to boardf

[Simon Glass]

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

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

 common/board_f.c                  | 11 ++++++-----
 include/asm-generic/global_data.h |  4 ----
 include/board_f.h                 |  4 ++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index 83f14560cda..1e698d31841 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -626,8 +626,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;
@@ -710,10 +710,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 8f88ce09f4a..a23925ba9b3 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -394,10 +394,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 1eba236a961..05aa51510c2 100644
--- 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
-- 
2.34.1