diff options
| -rw-r--r-- | src/drivers/pc80/rtc/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/drivers/pc80/rtc/mc146818rtc.c | 11 | ||||
| -rw-r--r-- | src/drivers/pc80/rtc/mc146818rtc_romcc.c (renamed from src/drivers/pc80/rtc/mc146818rtc_early.c) | 0 | ||||
| -rw-r--r-- | src/drivers/uart/util.c | 2 | ||||
| -rw-r--r-- | src/include/pc80/mc146818rtc.h | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/drivers/pc80/rtc/Makefile.inc b/src/drivers/pc80/rtc/Makefile.inc index 5edb59bb1a..5d7aef1c1f 100644 --- a/src/drivers/pc80/rtc/Makefile.inc +++ b/src/drivers/pc80/rtc/Makefile.inc @@ -1,9 +1,6 @@ ifeq ($(CONFIG_ARCH_X86),y) -romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_early.c romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c - -ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_early.c ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c ifeq ($(CONFIG_USE_OPTION_TABLE),y) diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c index a102917d8d..33860b8de3 100644 --- a/src/drivers/pc80/rtc/mc146818rtc.c +++ b/src/drivers/pc80/rtc/mc146818rtc.c @@ -304,6 +304,17 @@ static enum cb_err set_cmos_value(unsigned long bit, unsigned long length, return CB_SUCCESS; } +unsigned int read_option_lowlevel(unsigned int start, unsigned int size, + unsigned int def) +{ + printk(BIOS_NOTICE, "NOTICE: read_option() used to access CMOS " + "from non-ROMCC code, please use get_option() instead.\n"); + if (IS_ENABLED(CONFIG_USE_OPTION_TABLE)) { + const unsigned char byte = cmos_read(start / 8); + return (byte >> (start & 7U)) & ((1U << size) - 1U); + } + return def; +} enum cb_err set_option(const char *name, void *value) { diff --git a/src/drivers/pc80/rtc/mc146818rtc_early.c b/src/drivers/pc80/rtc/mc146818rtc_romcc.c index 8bebc4229d..8bebc4229d 100644 --- a/src/drivers/pc80/rtc/mc146818rtc_early.c +++ b/src/drivers/pc80/rtc/mc146818rtc_romcc.c diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c index 86da8dc746..e1b83ba59d 100644 --- a/src/drivers/uart/util.c +++ b/src/drivers/uart/util.c @@ -24,7 +24,7 @@ unsigned int default_baudrate(void) static const unsigned baud[8] = { 115200, 57600, 38400, 19200, 9600, 4800, 2400, 1200 }; unsigned b_index = 0; -#if defined(__PRE_RAM__) +#if defined(__ROMCC__) b_index = read_option(baud_rate, 0xff); #else if (get_option(&b_index, "baud_rate") != CB_SUCCESS) diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index ef19a15363..ec0bf8effb 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -188,7 +188,7 @@ unsigned int read_option_lowlevel(unsigned int start, unsigned int size, unsigned int def); #else /* defined(__ROMCC__) */ -#include <drivers/pc80/rtc/mc146818rtc_early.c> +#include <drivers/pc80/rtc/mc146818rtc_romcc.c> #endif /* !defined(__ROMCC__) */ #define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name, \ CMOS_VLEN_ ##name, (default)) |