Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A234C433F5 for ; Thu, 13 Jan 2022 02:27:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6EC778313B; Thu, 13 Jan 2022 03:27:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="G60cU8l9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22F828326B; Thu, 13 Jan 2022 03:26:57 +0100 (CET) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E0EC8326B for ; Thu, 13 Jan 2022 03:26:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id x15so4296047ilc.5 for ; Wed, 12 Jan 2022 18:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QEhIJJYu0K44caRsRO7O7PlTlTQGWBfuygf9AotuxHE=; b=G60cU8l9cxVro0XKaemNsRWEqw/MKuoBhIllYn3MVcfQaF+ksB1l0HRypEr16rO82W Ar984hEke1vREtKPwtvaDqKEEiFstCslWfFeIDybIgr7xiBf2HehQHswpvzK6ZNoCf4J 7Tyc/Ga1KRsIILKEXREQMe+ArGL2f2O8kiTiQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QEhIJJYu0K44caRsRO7O7PlTlTQGWBfuygf9AotuxHE=; b=6+lj8oFoUt21yNUn6ytDDk51C8ZVoCwlyv7trerGoi96bmml0ymON6pPnfzpZaeFBO 4ZcBSEO50cmHIwILl6Mh66w8viGP79lImg1Oyqsa37xfCZMP0NHtk8VMkX2mP6XM9i1x QpcpDL351G843lTk3TYDKLVvRhInCaA3zxjC/D8JUZDE38WO2UX2msPRS8/vHv9IIzUL lXy+W2TH97AbctOUoQUW04pt+zFKxnAnKEx2uq1wOua52CCcqHJCM0cmublMHHi2BZzo vvOsTHEFc1jsQWPddDgm/4Pawfusb9YRhW9fd/ceWzUEqDObWlICSwQLRfmtsPQj0uEt iY5w== X-Gm-Message-State: AOAM531XoRCYjdhUIrnzgpsxHQ5XaZAD56l+9TrO69FKb77ePJOC+OFN LbHMwjk+MzVHm3XV379WvCH7Sjfuy8KSnw== X-Google-Smtp-Source: ABdhPJyXwobGIY1nVY254R1iCS/126nhw1v5/LfyjnwIoigh8XwOHBp3V1+bklLVSkgycw5cJkU0Dw== X-Received: by 2002:a92:c14c:: with SMTP id b12mr1291343ilh.249.1642040812306; Wed, 12 Jan 2022 18:26:52 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id e17sm965634ili.37.2022.01.12.18.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:26:52 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 05/12] bloblist: Drop unused tags Date: Wed, 12 Jan 2022 19:26:18 -0700 Message-Id: <20220113022625.413990-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog In-Reply-To: <20220113022625.413990-1-sjg@chromium.org> References: <20220113022625.413990-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 --- (no changes since v1) common/bloblist.c | 4 +--- include/bloblist.h | 2 -- test/bloblist.c | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common/bloblist.c b/common/bloblist.c index 89b415d6178..784eff61dea 100644 --- 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 d4d48f76ff4..fac25907c07 100644 --- 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 525e94b7217..2e8e23d77dd 100644 --- 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); -- 2.34.1.575.g55b058a8bb-goog