From fcbbb911162aa4dea1fc7fcc8794b22f86579fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 20 Apr 2020 10:21:39 +0300 Subject: Remove MAYBE_STATIC_BSS and ENV_STAGE_HAS_BSS_SECTION MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After removal of CAR_MIGRATION there are no more reasons to carry around ENV_STAGE_HAS_BSS_SECTION=n case. Replace 'MAYBE_STATIC_BSS' with 'static' and remove explicit zero-initializers. Change-Id: I14dd9f52da5b06f0116bd97496cf794e5e71bc37 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/40535 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Duncan Laurie Reviewed-by: Julius Werner Reviewed-by: Furquan Shaikh --- src/security/tpm/tspi/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/security') diff --git a/src/security/tpm/tspi/log.c b/src/security/tpm/tspi/log.c index 07623f75b1..1d6f9acf32 100644 --- a/src/security/tpm/tspi/log.c +++ b/src/security/tpm/tspi/log.c @@ -11,7 +11,7 @@ static struct tcpa_table *tcpa_cbmem_init(void) { - MAYBE_STATIC_BSS struct tcpa_table *tclt = NULL; + static struct tcpa_table *tclt; if (tclt) return tclt; @@ -32,7 +32,7 @@ static struct tcpa_table *tcpa_cbmem_init(void) struct tcpa_table *tcpa_log_init(void) { - MAYBE_STATIC_BSS struct tcpa_table *tclt = NULL; + static struct tcpa_table *tclt; /* We are dealing here with pre CBMEM environment. * If cbmem isn't available use CAR or SRAM */ -- cgit v1.2.3