Merge https://source.denx.de/u-boot/custodians/u-boot-usb

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

diff --git a/common/bloblist.c b/common/bloblist.c
index 0049bb9..0d63b6e 100644 (file)
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -1,14 +1,14 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
 /*
  * Copyright 2018 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
  */
 
-#define LOG_DEBUG
 #define LOG_CATEGORY   LOGC_BLOBLIST
 
 #include <common.h>
 #include <bloblist.h>
+#include <display_options.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -367,6 +367,18 @@ int bloblist_finish(void)
        return 0;
 }
 
+ulong bloblist_get_base(void)
+{
+       return map_to_sysmem(gd->bloblist);
+}
+
+ulong bloblist_get_size(void)
+{
+       struct bloblist_hdr *hdr = gd->bloblist;
+
+       return hdr->size;
+}
+
 void bloblist_get_stats(ulong *basep, ulong *sizep, ulong *allocedp)
 {
        struct bloblist_hdr *hdr = gd->bloblist;
@@ -418,18 +430,23 @@ void bloblist_reloc(void *to, uint to_size, void *from, uint from_size)
 
 int bloblist_init(void)
 {
+       bool fixed = IS_ENABLED(CONFIG_BLOBLIST_FIXED);
        int ret = -ENOENT;
        ulong addr, size;
        bool expected;
 
        /**
-        * Wed expect to find an existing bloblist in the first phase of U-Boot
-        * that runs
+        * We don't expect to find an existing bloblist in the first phase of
+        * U-Boot that runs. Also we have no way to receive the address of an
+        * allocated bloblist from a previous stage, so it must be at a fixed
+        * address.
         */
-       expected = !u_boot_first_phase();
+       expected = fixed && !u_boot_first_phase();
        if (spl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST))
                expected = false;
-       addr = bloblist_addr();
+       if (fixed)
+               addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
+                                     CONFIG_BLOBLIST_ADDR);
        size = CONFIG_BLOBLIST_SIZE;
        if (expected) {
                ret = bloblist_check(addr, size);
@@ -448,6 +465,8 @@ int bloblist_init(void)
                        if (!ptr)
                                return log_msg_ret("alloc", -ENOMEM);
                        addr = map_to_sysmem(ptr);
+               } else if (!fixed) {
+                       return log_msg_ret("!fixed", ret);
                }
                log_debug("Creating new bloblist size %lx at %lx\n", size,
                          addr);