summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-04 13:00:02 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-07 18:40:37 +0000
commit731e58e3197c43be49430f1b28445fcf85a7ed94 (patch)
tree9c5fd26e55365dc49732335ba456b35371b04f4b
parentbb5b9fee8c49867d7c933b675aa4cfe2d2ae2c13 (diff)
downloadcoreboot-731e58e3197c43be49430f1b28445fcf85a7ed94.tar.xz
drivers/pc80/rtc: Remove stub for sanitize_cmos()
We only have a single call-site for this. Change-Id: I7ab19c6ea4ef01334f4d229c5636b64f99c86119 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38182 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/include/pc80/mc146818rtc.h9
-rw-r--r--src/lib/bootblock.c3
2 files changed, 3 insertions, 9 deletions
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 00606d4017..5fd07294b6 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -215,16 +215,9 @@ void cmos_post_log(void);
static inline void cmos_post_log(void) {}
#endif /* CONFIG_CMOS_POST */
-#if CONFIG(USE_OPTION_TABLE)
-void sanitize_cmos(void);
-#else
-static inline void sanitize_cmos(void) {}
-#endif /* CONFIG_USE_OPTION_TABLE */
-
-#else /* !CONFIG_ARCH_X86 */
-static inline void sanitize_cmos(void) {}
#endif /* CONFIG_ARCH_X86 */
+void sanitize_cmos(void);
void cmos_post_init(void);
#endif /* PC80_MC146818RTC_H */
diff --git a/src/lib/bootblock.c b/src/lib/bootblock.c
index 6d40bc0075..beb6701cee 100644
--- a/src/lib/bootblock.c
+++ b/src/lib/bootblock.c
@@ -56,7 +56,8 @@ static void bootblock_main_with_timestamp(uint64_t base_timestamp,
bootblock_soc_early_init();
bootblock_mainboard_early_init();
- sanitize_cmos();
+ if (CONFIG(USE_OPTION_TABLE))
+ sanitize_cmos();
if (CONFIG(CMOS_POST))
cmos_post_init();