Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38184 )
Change subject: drivers/pc80/rtc: Enable normal/fallback without USE_OPTION_TABLE ......................................................................
drivers/pc80/rtc: Enable normal/fallback without USE_OPTION_TABLE
Due the !USE_OPTION_TABLE it always booted to fallback.
Change-Id: I44eb50df4389d1ac9e4c746f53654aff1055d400 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38184 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/drivers/pc80/rtc/mc146818rtc_boot.c 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/src/drivers/pc80/rtc/mc146818rtc_boot.c b/src/drivers/pc80/rtc/mc146818rtc_boot.c index 718cfbf..d345281 100644 --- a/src/drivers/pc80/rtc/mc146818rtc_boot.c +++ b/src/drivers/pc80/rtc/mc146818rtc_boot.c @@ -44,7 +44,7 @@ { unsigned char byte;
- if (!CONFIG(USE_OPTION_TABLE) || cmos_error() || !cmos_lb_cks_valid()) { + if (cmos_error() || (CONFIG(USE_OPTION_TABLE) && !cmos_lb_cks_valid())) { /* Invalid CMOS checksum detected! * Force fallback boot... */