sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- include option_table.h when it is created, and that's HAVE_OPTION_TABLE

Browse Source 
- add some __PRE_RAM__ guards where needed
- use OPTION_TABLE_H

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5317 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2010-03-29 21:50:53 +00:00
committed by Stefan Reinauer
parent 2c5dc65949
commit 8655412673
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/Makefile.inc
View File

@ -196,7 +196,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/
$(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@ $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@
else 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" @printf " CC $(subst $(obj)/,,$(@))\n"
$(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@ $(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@

2
src/include/fallback.h
View File

@ -1,7 +1,7 @@
#ifndef FALLBACK_H #ifndef FALLBACK_H
#define FALLBACK_H #define FALLBACK_H
#ifndef ASSEMBLY #if !defined(ASSEMBLY) && !defined(__PRE_RAM__)
void set_boot_successful(void); void set_boot_successful(void);
void boot_successful(void); void boot_successful(void);

4
src/include/pc80/mc146818rtc.h
View File

@ -82,11 +82,11 @@
#define PC_CKS_LOC 46 #define PC_CKS_LOC 46
/* coreboot cmos checksum is usually only built over bytes 49..125 */ /* coreboot cmos checksum is usually only built over bytes 49..125 */
#ifdef AUTOCONF_INCLUDED #if CONFIG_HAVE_OPTION_TABLE
#include <option_table.h> #include <option_table.h>
#endif #endif
#if !defined(ASSEMBLY) #if !defined(ASSEMBLY) && !defined(__PRE_RAM__)
void rtc_init(int invalid); void rtc_init(int invalid);
#if CONFIG_USE_OPTION_TABLE == 1 #if CONFIG_USE_OPTION_TABLE == 1
int get_option(void *dest, const char *name); int get_option(void *dest, const char *name);