Add a U_BOOT prefix to this tag since it is specific to the U-Boot
project.
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/x86/cpu/broadwell/cpu_from_spl.c | 4 ++--
common/bloblist.c | 2 +-
common/board_f.c | 2 +-
common/spl/spl.c | 4 ++--
include/bloblist.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c
b/arch/x86/cpu/broadwell/cpu_from_spl.c
index e5f62e7187c..df5a9675ee4 100644
--- 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 1290fff8504..557e892c854 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -31,7 +31,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 3dc0eaa59c5..261d0f52cd7 100644
--- 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 0c08da06e8f..55e33d2fc44 100644
--- 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 29ea5a768a6..d4d48f76ff4 100644
--- 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 */
/*
--
2.33.1.1089.g2158813163f-goog
