Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38182 )
Change subject: drivers/pc80/rtc: Remove stub for sanitize_cmos() ......................................................................
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 --- M src/include/pc80/mc146818rtc.h M src/lib/bootblock.c 2 files changed, 3 insertions(+), 9 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 00606d4..5fd0729 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -215,16 +215,9 @@ 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 6d40bc0..beb6701 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -56,7 +56,8 @@ bootblock_soc_early_init(); bootblock_mainboard_early_init();
- sanitize_cmos(); + if (CONFIG(USE_OPTION_TABLE)) + sanitize_cmos();
if (CONFIG(CMOS_POST)) cmos_post_init();