From 919923def3d76a95665c60e7ff3dd033c2d65d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Tue, 28 Jan 2014 10:02:53 +0200
Subject: option: Add arch-agnostic get_option()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We should not have pc80/ includes in console/.

Change-Id: Id7da732b1ea094be01f45f9dbb49142f4e78f095
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5157
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/console/console.c   | 13 +------------
 src/drivers/uart/util.c |  2 +-
 src/include/option.h    | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 src/include/option.h

diff --git a/src/console/console.c b/src/console/console.c
index 38ac3e7d35..081113c6db 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/drivers/uart/util.c b/src/drivers/uart/util.c
index c577048fb5..e09b686a9c 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <uart.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 0000000000..83f3a84614
--- /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_ */
-- 
cgit v1.2.3