From 8655412673f650839fa659849da6e356895524ae Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 29 Mar 2010 21:50:53 +0000 Subject: - include option_table.h when it is created, and that's HAVE_OPTION_TABLE - add some __PRE_RAM__ guards where needed - use OPTION_TABLE_H Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5317 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/fallback.h | 2 +- src/include/pc80/mc146818rtc.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/include') diff --git a/src/include/fallback.h b/src/include/fallback.h index 4af826616a..b639452bac 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -1,7 +1,7 @@ #ifndef FALLBACK_H #define FALLBACK_H -#ifndef ASSEMBLY +#if !defined(ASSEMBLY) && !defined(__PRE_RAM__) void set_boot_successful(void); void boot_successful(void); diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 9fb04c220a..4172a4a28a 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -82,11 +82,11 @@ #define PC_CKS_LOC 46 /* coreboot cmos checksum is usually only built over bytes 49..125 */ -#ifdef AUTOCONF_INCLUDED +#if CONFIG_HAVE_OPTION_TABLE #include #endif -#if !defined(ASSEMBLY) +#if !defined(ASSEMBLY) && !defined(__PRE_RAM__) void rtc_init(int invalid); #if CONFIG_USE_OPTION_TABLE == 1 int get_option(void *dest, const char *name); -- cgit v1.2.3