Patch set updated for coreboot: 340aca4 option: Add arch-agnostic get_option()

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5157

-gerrit

commit 340aca45a48bb84c2bb28422208412595e217442
Author: Kyösti Mälkki 
Date:   Tue Jan 28 10:02:53 2014 +0200

option: Add arch-agnostic get_option()

We should not have pc80/ includes in console/.

Change-Id: Id7da732b1ea094be01f45f9dbb49142f4e78f095
    Signed-off-by: Kyösti Mälkki 
---
 src/console/console.c | 13 +------------
 src/console/util.c    |  2 +-
 src/include/option.h  | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/console/console.c b/src/console/console.c
index 38ac3e7..081113c 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -25,18 +25,7 @@
 #ifndef __PRE_RAM__
 #include <string.h>
 #include <types.h>
-
-/*
- * FIXME: get_option() needs to be abstracted better so that other non-volatile
- * storage can be used. This will benefit machines without CMOS as well as those
- * without a battery-backed CMOS (e.g. some laptops).
- */
-#if CONFIG_USE_OPTION_TABLE
-#include <pc80/mc146818rtc.h>
-#else
-static inline enum cb_err get_option(void *dest, const char *name)
-				{ return CB_CMOS_OTABLE_DISABLED; }
-#endif
+#include <option.h>

/* initialize the console */
 void console_init(void)
diff --git a/src/console/util.c b/src/console/util.c
index a7651fb..405657d 100644
--- a/src/console/util.c
+++ b/src/console/util.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <uart8250.h>
 #if CONFIG_USE_OPTION_TABLE
-#include <pc80/mc146818rtc.h>
+#include <option.h>
 #include "option_table.h"
 #endif

diff --git a/src/include/option.h b/src/include/option.h
new file mode 100644
index 0000000..83f3a84
--- /dev/null
+++ b/src/include/option.h
@@ -0,0 +1,19 @@
+#ifndef _OPTION_H_
+#define _OPTION_H_
+
+/*
+ * FIXME: get_option() needs to be abstracted better so that other non-volatile
+ * storage can be used. This will benefit machines without CMOS as well as those
+ * without a battery-backed CMOS (e.g. some laptops).
+ */
+#if CONFIG_USE_OPTION_TABLE
+#include <pc80/mc146818rtc.h>
+#else
+#include <types.h>
+static inline enum cb_err get_option(void *dest, const char *name)
+{
+	return CB_CMOS_OTABLE_DISABLED;
+}
+#endif
+
+#endif /* _OPTION_H_ */