From fcbbb911162aa4dea1fc7fcc8794b22f86579fe8 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki 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/ec/google/chromeec/ec.c | 2 +- src/ec/google/chromeec/ec_lpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ec') diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index b96458152d..034e9313c9 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -1343,7 +1343,7 @@ static void google_chromeec_log_uptimeinfo(void) /* Cache and retrieve the EC image type (ro or rw) */ enum ec_image google_chromeec_get_current_image(void) { - MAYBE_STATIC_BSS enum ec_image ec_image_type = EC_IMAGE_UNKNOWN; + static enum ec_image ec_image_type = EC_IMAGE_UNKNOWN; if (ec_image_type != EC_IMAGE_UNKNOWN) return ec_image_type; diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 52b5e6469b..5306dcca5b 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -387,7 +387,7 @@ void google_chromeec_ioport_range(uint16_t *out_base, size_t *out_size) int google_chromeec_command(struct chromeec_command *cec_command) { - MAYBE_STATIC_BSS int command_version = 0; + static int command_version; if (command_version <= 0) command_version = google_chromeec_command_version(); -- cgit v1.2.3