2 files changed, 28 insertions, 12 deletions
diff --git a/src/include/option.h b/src/include/option.h
index 3a20dcf196..198ca00d02 100644
--- a/src/include/option.h
+++ b/src/include/option.h
@@ -1,19 +1,38 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #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>
+
+enum cb_err cmos_set_option(const char *name, void *val);
+enum cb_err cmos_get_option(void *dest, const char *name);
+
+static inline enum cb_err set_option(const char *name, void *val)
+{
+	if (CONFIG(USE_OPTION_TABLE))
+		return cmos_set_option(name, val);
+
+	return CB_CMOS_OTABLE_DISABLED;
+}
+
 static inline enum cb_err get_option(void *dest, const char *name)
 {
+	if (CONFIG(USE_OPTION_TABLE))
+		return cmos_get_option(dest, name);
+
 	return CB_CMOS_OTABLE_DISABLED;
 }
-#endif
 
 #endif /* _OPTION_H_ */
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 91413d11d5..9cd00b525c 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -181,9 +181,6 @@ int cmos_lb_cks_valid(void);
 int cmos_checksum_valid(int range_start, int range_end, int cks_loc);
 void cmos_set_checksum(int range_start, int range_end, int cks_loc);
 
-enum cb_err set_option(const char *name, void *val);
-enum cb_err get_option(void *dest, const char *name);
-
 #if CONFIG(CMOS_POST)
 #if CONFIG(USE_OPTION_TABLE)
 # include "option_table.h"