[coreboot] [commit] r5317 - in trunk/src: arch/i386 include include/pc80

[repository service]

Author: stepan
Date: Mon Mar 29 23:50:53 2010
New Revision: 5317
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5317

Log:
- 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 <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>

Modified:
   trunk/src/arch/i386/Makefile.inc
   trunk/src/include/fallback.h
   trunk/src/include/pc80/mc146818rtc.h

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Mon Mar 29 23:17:25 2010	(r5316)
+++ trunk/src/arch/i386/Makefile.inc	Mon Mar 29 23:50:53 2010	(r5317)
@@ -196,7 +196,7 @@
 	$(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@
 else
 
-$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
+$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(OPTION_TABLE_H)
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
 

Modified: trunk/src/include/fallback.h
==============================================================================
--- trunk/src/include/fallback.h	Mon Mar 29 23:17:25 2010	(r5316)
+++ trunk/src/include/fallback.h	Mon Mar 29 23:50:53 2010	(r5317)
@@ -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);

Modified: trunk/src/include/pc80/mc146818rtc.h
==============================================================================
--- trunk/src/include/pc80/mc146818rtc.h	Mon Mar 29 23:17:25 2010	(r5316)
+++ trunk/src/include/pc80/mc146818rtc.h	Mon Mar 29 23:50:53 2010	(r5317)
@@ -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 <option_table.h>
 #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);