GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 5762. It silently broke a lot of boards because abuild was broken. 

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5764 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2010-09-02 18:29:31 +00:00
parent 70679a095a
commit e448eba759
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,14 @@
#define PC_CKS_RANGE_END 45 #define PC_CKS_RANGE_END 45
#define PC_CKS_LOC 46 #define PC_CKS_LOC 46
/* coreboot cmos checksum is usually only built over bytes 49..125
* LB_CKS_RANGE_START, LB_CKS_RANGE_END and LB_CKS_LOC are defined
* in option_table.h
*/
#if CONFIG_HAVE_OPTION_TABLE
#include <option_table.h>
#endif
#ifndef UTIL_BUILD_OPTION_TABLE #ifndef UTIL_BUILD_OPTION_TABLE
#include <arch/io.h> #include <arch/io.h>
static inline unsigned char cmos_read(unsigned char addr) static inline unsigned char cmos_read(unsigned char addr)

6
src/mainboard/amd/dbm690t/Kconfig
View File

@ -25,6 +25,12 @@ config MAINBOARD_DIR
string string
default amd/dbm690t default amd/dbm690t
# This is a temporary fix, and should be removed when the race condition for
# building option_table.h is fixed.
config WARNINGS_ARE_ERRORS
bool
default n
config DCACHE_RAM_BASE config DCACHE_RAM_BASE
hex hex
default 0xc8000 default 0xc8000

1
src/pc80/Makefile.inc
View File

@ -8,4 +8,3 @@ initobj-$(CONFIG_CACHE_AS_RAM) += serial.o
subdirs-y += vga subdirs-y += vga
$(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H) $(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H)
$(obj)/pc80/mc146818rtc_early.initobj.o : $(OPTION_TABLE_H)

3
src/pc80/mc146818rtc.c
View File

@ -2,9 +2,6 @@
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
#include <string.h> #include <string.h>
#if CONFIG_USE_OPTION_TABLE
#include <option_table.h>
#endif
/* control registers - Moto names /* control registers - Moto names
*/ */

4
src/pc80/mc146818rtc_early.c
View File

@ -1,10 +1,6 @@
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <fallback.h> #include <fallback.h>
#if CONFIG_USE_OPTION_TABLE
#include <option_table.h>
#endif
#ifndef CONFIG_MAX_REBOOT_CNT #ifndef CONFIG_MAX_REBOOT_CNT
#error "CONFIG_MAX_REBOOT_CNT not defined" #error "CONFIG_MAX_REBOOT_CNT not defined"
#endif #endif