David Hendricks (dhendrix@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1962
-gerrit
commit c863b51bb5b6373c90d413c7f920fadb4ff0b582 Author: David Hendricks dhendrix@chromium.org Date: Fri Nov 30 19:16:50 2012 -0800
Conditionally include mc146818rtc in console.c
This removes an unneeded header (pc80/mc146818rtc.h) if CMOS is unused and defines a weak symbol for get_option.
Change-Id: I6adf371d79164178f40a83f7608289a6a7673357 Signed-off-by: David Hendricks dhendrix@chromium.org --- src/console/console.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/src/console/console.c b/src/console/console.c index 8f60f04..f25a4a2 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -24,7 +24,21 @@
#ifndef __PRE_RAM__ #include <string.h> + +#ifdef HAVE_CMOS_DEFAULT #include <pc80/mc146818rtc.h> +#endif + +/* + * FIXME(dhendrix): stub for get_option(). This function is usually defined in + * mc146818rtc.c and libpayload. For now, make it a weak symbol that returns an + * error code to let the caller decide what to do (ie use default value). + */ +int __attribute__((weak)) get_option(void *dest, const char *name); +int __attribute__((weak)) get_option(void *dest, const char *name) +{ + return -1; +}
/* initialize the console */ void console_init(void)