[coreboot-gerrit] Change in coreboot[master]: drivers/pc80/rtc: Rename mc146818rtc_early.c -> _romcc.c

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19663 )

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


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

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 at secunet.com>
Reviewed-on: https://review.coreboot.org/19663
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Tested-by: Raptor Engineering Automated Test Stand <noreply at raptorengineeringinc.com>
Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
M src/drivers/pc80/rtc/Makefile.inc
M src/drivers/pc80/rtc/mc146818rtc.c
R src/drivers/pc80/rtc/mc146818rtc_romcc.c
M src/drivers/uart/util.c
M src/include/pc80/mc146818rtc.h
5 files changed, 13 insertions(+), 5 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Raptor Engineering Automated Test Stand: Verified
  Paul Menzel: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified



diff --git a/src/drivers/pc80/rtc/Makefile.inc b/src/drivers/pc80/rtc/Makefile.inc
index 5edb59b..5d7aef1 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 a102917..33860b8 100644
--- a/src/drivers/pc80/rtc/mc146818rtc.c
+++ b/src/drivers/pc80/rtc/mc146818rtc.c
@@ -304,6 +304,17 @@
 	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
similarity index 100%
rename from src/drivers/pc80/rtc/mc146818rtc_early.c
rename to src/drivers/pc80/rtc/mc146818rtc_romcc.c
diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c
index 86da8dc..e1b83ba 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -24,7 +24,7 @@
 	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 ef19a15..ec0bf8e 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -188,7 +188,7 @@
 	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))

-- 
To view, visit https://review.coreboot.org/19663
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54ea08de034766c8140b320075d36d5e811582fa
Gerrit-PatchSet: 4
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Aaron Durbin <adurbin at chromium.org>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki at gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Gerrit-Reviewer: Raptor Engineering Automated Test Stand <noreply at raptorengineeringinc.com>
Gerrit-Reviewer: Timothy Pearson <tpearson at raptorengineering.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-Reviewer: coreboot org <coreboot.org at gmail.com>
Gerrit-Reviewer: lava.coreboot.org <lavacoreboot at gmail.com>