From: Patrick Georgi Date: Tue, 22 Nov 2011 09:27:24 +0000 (+0100) Subject: Fix CMOS handling for non-USE_OPTION_TABLE configuration X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=a27561c3c9c465ac336fafe1b6ca24d2aabc95e9 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 Reviewed-on: http://review.coreboot.org/442 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index d6dcf01b7..3e5a61a70 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