summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-04 20:05:37 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2020-01-07 18:41:26 +0000
commit23063305dcee93317d1dd6b424de8a74f1c60d7e (patch)
treeb7a12dfdda7dc41a841e8933f8e25088ab5169ae /src
parentfd15c0b8fa72822056fe8d5a51a879e869472ade (diff)
downloadcoreboot-23063305dcee93317d1dd6b424de8a74f1c60d7e.tar.xz
drivers/pc80/rtc: Refactor some USE_OPTION_TABLE
Change-Id: I3a5004db021af6127de2f058bec9d84a985bae67 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38183 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/pc80/rtc/mc146818rtc_boot.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/drivers/pc80/rtc/mc146818rtc_boot.c b/src/drivers/pc80/rtc/mc146818rtc_boot.c
index a52e2220f1..2998c73baa 100644
--- a/src/drivers/pc80/rtc/mc146818rtc_boot.c
+++ b/src/drivers/pc80/rtc/mc146818rtc_boot.c
@@ -15,13 +15,12 @@
#include <cbfs.h>
#include <pc80/mc146818rtc.h>
#include <fallback.h>
+
#if CONFIG(USE_OPTION_TABLE)
#include <option_table.h>
-#endif
int cmos_chksum_valid(void)
{
-#if CONFIG(USE_OPTION_TABLE)
unsigned char addr;
u16 sum, old_sum;
@@ -35,12 +34,8 @@ int cmos_chksum_valid(void)
old_sum |= cmos_read(LB_CKS_LOC + 1);
return sum == old_sum;
-#else
- return 0;
-#endif
}
-#if CONFIG(USE_OPTION_TABLE)
void sanitize_cmos(void)
{
if (cmos_error() || !cmos_chksum_valid() ||
@@ -88,7 +83,7 @@ int do_normal_boot(void)
{
unsigned char byte;
- if (cmos_error() || !cmos_chksum_valid()) {
+ if (!CONFIG(USE_OPTION_TABLE) || cmos_error() || !cmos_chksum_valid()) {
/* Invalid CMOS checksum detected!
* Force fallback boot...
*/