drivers/pc80: Move normal/fallback mechanism outside __ROMCC__

Change-Id: I840885ca543375c77b7406434fd8bb4085e26938
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37759
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>

3 files changed, 62 insertions, 101 deletions

diff --git a/src/drivers/pc80/rtc/mc146818rtc_boot.c b/src/drivers/pc80/rtc/mc146818rtc_boot.c
index 0ac06b3152..3000946413 100644
--- a/src/drivers/pc80/rtc/mc146818rtc_boot.c
+++ b/src/drivers/pc80/rtc/mc146818rtc_boot.c
@@ -12,17 +12,13 @@
  */
 
 #include <stdint.h>
-#ifdef __ROMCC__
-#include <arch/cbfs.h>
-#else
 #include <cbfs.h>
-#endif
 #include <pc80/mc146818rtc.h>
+#include <fallback.h>
 #if CONFIG(USE_OPTION_TABLE)
 #include <option_table.h>
 #endif
 
-int cmos_error(void);
 int cmos_error(void)
 {
 	unsigned char reg_d;
@@ -31,7 +27,6 @@ int cmos_error(void)
 	return (reg_d & RTC_VRT) == 0;
 }
 
-int cmos_chksum_valid(void);
 int cmos_chksum_valid(void)
 {
 #if CONFIG(USE_OPTION_TABLE)
@@ -60,12 +55,8 @@ void sanitize_cmos(void)
 	    CONFIG(STATIC_OPTION_TABLE)) {
 		size_t length = 128;
 		const unsigned char *cmos_default =
-#ifdef __ROMCC__
-			walkcbfs("cmos.default");
-#else
 			cbfs_boot_map_with_leak("cmos.default",
 					CBFS_COMPONENT_CMOS_DEFAULT, &length);
-#endif
 		if (cmos_default) {
 			size_t i;
 			cmos_disable_rtc();
@@ -76,3 +67,60 @@ void sanitize_cmos(void)
 	}
 }
 #endif
+
+#if  CONFIG_MAX_REBOOT_CNT > 15
+#error "CONFIG_MAX_REBOOT_CNT too high"
+#endif
+
+static inline int boot_count(uint8_t rtc_byte)
+{
+	return rtc_byte >> 4;
+}
+
+static inline uint8_t increment_boot_count(uint8_t rtc_byte)
+{
+	return rtc_byte + (1 << 4);
+}
+
+static inline uint8_t boot_set_fallback(uint8_t rtc_byte)
+{
+	return rtc_byte & ~RTC_BOOT_NORMAL;
+}
+
+static inline int boot_use_normal(uint8_t rtc_byte)
+{
+	return rtc_byte & RTC_BOOT_NORMAL;
+}
+
+int do_normal_boot(void)
+{
+	unsigned char byte;
+
+	if (cmos_error() || !cmos_chksum_valid()) {
+		/* Invalid CMOS checksum detected!
+		 * Force fallback boot...
+		 */
+		byte = cmos_read(RTC_BOOT_BYTE);
+		byte &= boot_set_fallback(byte) & 0x0f;
+		byte |= 0xf << 4;
+		cmos_write(byte, RTC_BOOT_BYTE);
+	}
+
+	/* The RTC_BOOT_BYTE is now o.k. see where to go. */
+	byte = cmos_read(RTC_BOOT_BYTE);
+
+	/* Are we attempting to boot normally? */
+	if (boot_use_normal(byte)) {
+		/* Are we already at the max count? */
+		if (boot_count(byte) < CONFIG_MAX_REBOOT_CNT)
+			byte = increment_boot_count(byte);
+		else
+			byte = boot_set_fallback(byte);
+	}
+
+	/* Save the boot byte */
+	cmos_write(byte, RTC_BOOT_BYTE);
+
+	/* Return selected code path for this boot attempt */
+	return boot_use_normal(byte);
+}
diff --git a/src/drivers/pc80/rtc/mc146818rtc_romcc.c b/src/drivers/pc80/rtc/mc146818rtc_romcc.c
deleted file mode 100644
index 4405443501..0000000000
--- a/src/drivers/pc80/rtc/mc146818rtc_romcc.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <stdint.h>
-#include <pc80/mc146818rtc.h>
-#include <fallback.h>
-
-#include "mc146818rtc_boot.c"
-
-#if  CONFIG_MAX_REBOOT_CNT > 15
-#error "CONFIG_MAX_REBOOT_CNT too high"
-#endif
-
-static inline __attribute__((unused)) int boot_count(uint8_t rtc_byte)
-{
-	return rtc_byte >> 4;
-}
-
-static inline __attribute__((unused)) uint8_t increment_boot_count(uint8_t rtc_byte)
-{
-	return rtc_byte + (1 << 4);
-}
-
-static inline __attribute__((unused)) uint8_t boot_set_fallback(uint8_t rtc_byte)
-{
-	return rtc_byte & ~RTC_BOOT_NORMAL;
-}
-
-static inline __attribute__((unused)) int boot_use_normal(uint8_t rtc_byte)
-{
-	return rtc_byte & RTC_BOOT_NORMAL;
-}
-
-static inline __attribute__((unused)) int do_normal_boot(void)
-{
-	unsigned char byte;
-
-	if (cmos_error() || !cmos_chksum_valid()) {
-		/* Invalid CMOS checksum detected!
-		 * Force fallback boot...
-		 */
-		byte = cmos_read(RTC_BOOT_BYTE);
-		byte &= boot_set_fallback(byte) & 0x0f;
-		byte |= 0xf << 4;
-		cmos_write(byte, RTC_BOOT_BYTE);
-	}
-
-	/* The RTC_BOOT_BYTE is now o.k. see where to go. */
-	byte = cmos_read(RTC_BOOT_BYTE);
-
-	/* Are we attempting to boot normally? */
-	if (boot_use_normal(byte)) {
-		/* Are we already at the max count? */
-		if (boot_count(byte) < CONFIG_MAX_REBOOT_CNT)
-			byte = increment_boot_count(byte);
-		else
-			byte = boot_set_fallback(byte);
-	}
-
-	/* Save the boot byte */
-	cmos_write(byte, RTC_BOOT_BYTE);
-
-	/* Return selected code path for this boot attempt */
-	return boot_use_normal(byte);
-}
-
-unsigned int read_option_lowlevel(unsigned int start, unsigned int size, unsigned int def)
-{
-#if CONFIG(USE_OPTION_TABLE)
-	unsigned int byte;
-
-	byte = cmos_read(start/8);
-	return (byte >> (start & 7U)) & ((1U << size) - 1U);
-#else
-	return def;
-#endif
-}
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 6fa5e46404..afa4d9714c 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -178,18 +178,18 @@ static inline void cmos_write32(u8 offset, u32 value)
 		cmos_write((value >> (i << 3)) & 0xff, offset + i);
 }
 
-#if !defined(__ROMCC__)
 void cmos_init(bool invalid);
 void cmos_check_update_date(void);
+int cmos_error(void);
+int cmos_chksum_valid(void);
 
 enum cb_err set_option(const char *name, void *val);
 enum cb_err get_option(void *dest, const char *name);
 unsigned int read_option_lowlevel(unsigned int start, unsigned int size,
 	unsigned int def);
 
-#else /* defined(__ROMCC__) */
-#include <drivers/pc80/rtc/mc146818rtc_romcc.c>
-#endif /* !defined(__ROMCC__) */
+int do_normal_boot(void);
+
 #define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name, \
 	CMOS_VLEN_ ##name, (default))