Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38181 )
Change subject: drivers/pc80/rtc: Remove stub for cmos_post_init() ......................................................................
drivers/pc80/rtc: Remove stub for cmos_post_init()
We only have a single call-site for this.
Change-Id: Ia05a762691351b37cc59b39222fec737b29e913c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/include/pc80/mc146818rtc.h M src/lib/bootblock.c 2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/38181/1
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 88c9cc2..6d12940 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -211,10 +211,8 @@ #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 @@ #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 5fb6067..6d40bc0 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -57,7 +57,9 @@ bootblock_mainboard_early_init();
sanitize_cmos(); - cmos_post_init(); + + if (CONFIG(CMOS_POST)) + cmos_post_init();
if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init();
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38181 )
Change subject: drivers/pc80/rtc: Remove stub for cmos_post_init() ......................................................................
Patch Set 4: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38181 )
Change subject: drivers/pc80/rtc: Remove stub for cmos_post_init() ......................................................................
drivers/pc80/rtc: Remove stub for cmos_post_init()
We only have a single call-site for this.
Change-Id: Ia05a762691351b37cc59b39222fec737b29e913c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38181 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/include/pc80/mc146818rtc.h M src/lib/bootblock.c 2 files changed, 5 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 3063226..00606d4 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -211,10 +211,8 @@ #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 @@ #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 5fb6067..6d40bc0 100644 --- a/src/lib/bootblock.c +++ b/src/lib/bootblock.c @@ -57,7 +57,9 @@ bootblock_mainboard_early_init();
sanitize_cmos(); - cmos_post_init(); + + if (CONFIG(CMOS_POST)) + cmos_post_init();
if (CONFIG(BOOTBLOCK_CONSOLE)) { console_init();