From bb5b9fee8c49867d7c933b675aa4cfe2d2ae2c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 4 Jan 2020 13:00:02 +0200 Subject: drivers/pc80/rtc: Remove stub for cmos_post_init() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We only have a single call-site for this. Change-Id: Ia05a762691351b37cc59b39222fec737b29e913c Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/38181 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/include/pc80/mc146818rtc.h | 5 ++--- src/lib/bootblock.c | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 306322654e..00606d4017 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -211,10 +211,8 @@ enum cb_err get_option(void *dest, const char *name); #define CMOS_POST_EXTRA_DEV_PATH 0x01 void cmos_post_log(void); -void cmos_post_init(void); #else static inline void cmos_post_log(void) {} -static inline void cmos_post_init(void) {} #endif /* CONFIG_CMOS_POST */ #if CONFIG(USE_OPTION_TABLE) @@ -224,8 +222,9 @@ static inline void sanitize_cmos(void) {} #endif /* CONFIG_USE_OPTION_TABLE */ #else /* !CONFIG_ARCH_X86 */ -static inline void cmos_post_init(void) {} static inline void sanitize_cmos(void) {} #endif /* CONFIG_ARCH_X86 */ +void cmos_post_init(void); + #endif /* PC80_MC146818RTC_H */ diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c index 5fb606731a..6d40bc0075 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -57,7 +57,9 @@ static void bootblock_main_with_timestamp(uint64_t base_timestamp, bootblock_mainboard_early_init(); sanitize_cmos(); - cmos_post_init(); + + if (CONFIG(CMOS_POST)) + cmos_post_init(); if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init(); -- cgit v1.2.3