From a04dee6895ec12927712f0f43009e534662b5088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 26 Dec 2019 10:57:51 +0200 Subject: drivers/pc80/mc146818rtc: Remove read_option_lowlevel() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a workaround for romcc. Change-Id: I34f41390afbd88f3ace7003fd18c2edd56712a67 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/37954 Reviewed-by: Angel Pons Reviewed-by: Paul Menzel Reviewed-by: Nico Huber Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- src/drivers/pc80/rtc/mc146818rtc.c | 12 ------------ src/include/pc80/mc146818rtc.h | 5 ----- 2 files changed, 17 deletions(-) (limited to 'src') diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c index d3efdec16d..2029b1e51f 100644 --- a/src/drivers/pc80/rtc/mc146818rtc.c +++ b/src/drivers/pc80/rtc/mc146818rtc.c @@ -345,18 +345,6 @@ 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 (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) { struct cmos_option_table *ct; diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index ecfa76dfbb..aa50773750 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -185,14 +185,9 @@ 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); int do_normal_boot(void); -#define read_option(name, default) read_option_lowlevel(CMOS_VSTART_ ##name, \ - CMOS_VLEN_ ##name, (default)) - #if CONFIG(CMOS_POST) #if CONFIG(USE_OPTION_TABLE) # include "option_table.h" -- cgit v1.2.3