sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/pc80/rtc: Rename mc146818rtc_early.c -> _romcc.c

Browse Source 
And don't link it. It's for ROMCC.

To make code happy that uses the ROMCC interface read_option(),
read_option_lowlevel() is ported to mc146818rtc.c along with
a message to use get_option() instead.

Change-Id: I54ea08de034766c8140b320075d36d5e811582fa
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/19663
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Nico Huber 2017-05-11 16:40:40 +02:00 committed by Martin Roth
parent 7d46e96ed7
commit c3da3fe1d3
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/pc80/rtc/Makefile.inc
View File

@ -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)

11
src/drivers/pc80/rtc/mc146818rtc.c
View File

@ -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)
{

0
src/drivers/pc80/rtc/mc146818rtc_early.c → src/drivers/pc80/rtc/mc146818rtc_romcc.c
View File

2
src/drivers/uart/util.c
View File

@ -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)

2
src/include/pc80/mc146818rtc.h
View File

@ -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))