bloblist: Drop unused tags

The EC event log tag is no-longer used. The vboot handoff is now handled
by the vboot context instead.

Drop these unused tags.

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

diff --git a/common/bloblist.c b/common/bloblist.c
index 89b415d61783aeec3ce783a1c428022b13021ce3..784eff61dea5ef27c9b5f46a37662ea6e17231fb 100644 (file)
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -31,10 +31,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static const char *const tag_name[] = {
        [BLOBLISTT_NONE]                = "(none)",
-       [BLOBLISTT_EC_HOSTEVENT]        = "EC host event",
-       [BLOBLISTT_U_BOOT_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",
        [BLOBLISTT_INTEL_VBT]           = "Intel Video-BIOS table",
        [BLOBLISTT_TPM2_TCG_LOG]        = "TPM v2 log space",

diff --git a/include/bloblist.h b/include/bloblist.h
index d4d48f76ff42aaae9b77968b9b544911fc76bfe7..fac25907c07da92474077883e70569ad4c4a746e 100644 (file)
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -26,10 +26,8 @@ enum bloblist_tag_t {
        BLOBLISTT_NONE = 0,
 
        /* Vendor-specific tags are permitted here */
-       BLOBLISTT_EC_HOSTEVENT,         /* Chromium OS EC host-event mask */
        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 */
        /*
         * Advanced Configuration and Power Interface Global Non-Volatile
         * Sleeping table. This forms part of the ACPI tables passed to Linux.

diff --git a/test/bloblist.c b/test/bloblist.c
index 525e94b7217622862a19dba26ddc3f90d9343d92..2e8e23d77dd130ad33281f42c9cba10d83bdbad8 100644 (file)
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -289,9 +289,9 @@ static int bloblist_test_cmd_list(struct unit_test_state *uts)
        console_record_reset();
        run_command("bloblist list", 0);
        ut_assert_nextline("Address       Size  Tag Name");
-       ut_assert_nextline("%08lx  %8x    1 EC host event",
+       ut_assert_nextline("%08lx  %8x    1 SPL hand-off",
                           (ulong)map_to_sysmem(data), TEST_SIZE);
-       ut_assert_nextline("%08lx  %8x    2 SPL hand-off",
+       ut_assert_nextline("%08lx  %8x    2 Chrome OS vboot context",
                           (ulong)map_to_sysmem(data2), TEST_SIZE2);
        ut_assert_console_end();
        ut_unsilence_console(uts);