bloblist: Rename the SPL tag

Add a U_BOOT prefix to this tag since it is specific to the U-Boot
project.

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

diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index e5f62e7187cb9c32aa96e14bd2d685268474090e..df5a9675ee4baf380c7cd53fdbc79cd8f9013afe 100644 (file)
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -23,7 +23,7 @@ int dram_init(void)
 {
        struct spl_handoff *ho;
 
-       ho = bloblist_find(BLOBLISTT_SPL_HANDOFF, sizeof(*ho));
+       ho = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF, sizeof(*ho));
        if (!ho)
                return log_msg_ret("Missing SPL hand-off info", -ENOENT);
        handoff_load_dram_size(ho);
@@ -56,7 +56,7 @@ int dram_init_banksize(void)
 {
        struct spl_handoff *ho;
 
-       ho = bloblist_find(BLOBLISTT_SPL_HANDOFF, sizeof(*ho));
+       ho = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF, sizeof(*ho));
        if (!ho)
                return log_msg_ret("Missing SPL hand-off info", -ENOENT);
        handoff_load_dram_banks(ho);

diff --git a/common/bloblist.c b/common/bloblist.c
index 01b04103d9164eb95ad3a1aae421e42e6f6396a5..89b415d61783aeec3ce783a1c428022b13021ce3 100644 (file)
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static const char *const tag_name[] = {
        [BLOBLISTT_NONE]                = "(none)",
        [BLOBLISTT_EC_HOSTEVENT]        = "EC host event",
-       [BLOBLISTT_SPL_HANDOFF]         = "SPL hand-off",
+       [BLOBLISTT_U_BOOT_SPL_HANDOFF]          = "SPL hand-off",
        [BLOBLISTT_VBOOT_CTX]           = "Chrome OS vboot context",
        [BLOBLISTT_VBOOT_HANDOFF]       = "Chrome OS vboot hand-off",
        [BLOBLISTT_ACPI_GNVS]           = "ACPI GNVS",

diff --git a/common/board_f.c b/common/board_f.c
index dd69c3b6b779449db3c91225b267f46cbace6c74..a68760092ac1afacc4b2be9c88e29285c88d0b9e 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -283,7 +283,7 @@ static int setup_mon_len(void)
 static int setup_spl_handoff(void)
 {
 #if CONFIG_IS_ENABLED(HANDOFF)
-       gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF,
+       gd->spl_handoff = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF,
                                        sizeof(struct spl_handoff));
        debug("Found SPL hand-off info %p\n", gd->spl_handoff);
 #endif

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4c101ec5d34e8d90ebb8bdfa292b9f3ebd66aede..f51d1f3205242ced33b708eb3b2dfcff68c7ec42 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -408,7 +408,7 @@ static int setup_spl_handoff(void)
 {
        struct spl_handoff *ho;
 
-       ho = bloblist_ensure(BLOBLISTT_SPL_HANDOFF, sizeof(struct spl_handoff));
+       ho = bloblist_ensure(BLOBLISTT_U_BOOT_SPL_HANDOFF, sizeof(struct spl_handoff));
        if (!ho)
                return -ENOENT;
 
@@ -425,7 +425,7 @@ static int write_spl_handoff(void)
        struct spl_handoff *ho;
        int ret;
 
-       ho = bloblist_find(BLOBLISTT_SPL_HANDOFF, sizeof(struct spl_handoff));
+       ho = bloblist_find(BLOBLISTT_U_BOOT_SPL_HANDOFF, sizeof(struct spl_handoff));
        if (!ho)
                return -ENOENT;
        handoff_save_dram(ho);

diff --git a/include/bloblist.h b/include/bloblist.h
index 29ea5a768a61ee1a0423cf08030c2f0d8982aa1c..d4d48f76ff42aaae9b77968b9b544911fc76bfe7 100644 (file)
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -27,7 +27,7 @@ enum bloblist_tag_t {
 
        /* Vendor-specific tags are permitted here */
        BLOBLISTT_EC_HOSTEVENT,         /* Chromium OS EC host-event mask */
-       BLOBLISTT_SPL_HANDOFF,          /* Hand-off info from SPL */
+       BLOBLISTT_U_BOOT_SPL_HANDOFF,           /* Hand-off info from SPL */
        BLOBLISTT_VBOOT_CTX,            /* Chromium OS verified boot context */
        BLOBLISTT_VBOOT_HANDOFF,        /* Chromium OS internal handoff info */
        /*