summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-11-22 10:27:24 +0100
committerPatrick Georgi <patrick@georgi-clan.de>2011-12-13 23:20:49 +0100
commita27561c3c9c465ac336fafe1b6ca24d2aabc95e9 (patch)
tree52850d121c83a5589979c9d3d42ce85429dc8b23
parent90ca14d7004a3f53a13bdbe6401171b029baaf3d (diff)
downloadcoreboot-a27561c3c9c465ac336fafe1b6ca24d2aabc95e9.tar.xz
Fix CMOS handling for non-USE_OPTION_TABLE configuration
The read_option macro still emitted CMOS_VSTART_*/CMOS_VEND_* symbols, which fail without an option table (as no option_table.h defines them). Discard them by using a macro instead of a static inline function. Change-Id: I8d001f971681277a344b6788725746491546b607 Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/442 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/include/pc80/mc146818rtc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index d6dcf01b77..3e5a61a706 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -116,8 +116,7 @@ unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def);
static inline int set_option(const char *name __attribute__((unused)), void *val __attribute__((unused))) { return -2; };
static inline int get_option(void *dest __attribute__((unused)),
const char *name __attribute__((unused))) { return -2; }
-static inline unsigned read_option_lowlevel(unsigned start, unsigned size, unsigned def)
- { return def; }
+#define read_option_lowlevel(start, size, def) def
#endif
#else
#include <pc80/mc146818rtc_early.c>