diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-09-01 16:27:13 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-09-01 16:27:13 +0000 |
| commit | c3fad5633b8b17dc15c56733188fd27aa02589d9 (patch) | |
| tree | 1d72feb1d214da19fdaecc78f1c228d40b9398b1 /src/pc80 | |
| parent | a7f2b0e339a2a051d5e0269eaa8fbb84530b6058 (diff) | |
| download | coreboot-c3fad5633b8b17dc15c56733188fd27aa02589d9.tar.xz | |
Fix race condition in option_table.h generation by moving the include statement
to those files that actually need it. This significantly reduces the number of
dependencies, so it's no longer extremely ugly to specify them manually (see
the src/pc80/Makefile.inc portion)
Also, drop the AMD DBM690T work around for the issue.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5762 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/pc80')
| -rw-r--r-- | src/pc80/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/pc80/mc146818rtc.c | 3 | ||||
| -rw-r--r-- | src/pc80/mc146818rtc_early.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc index b7890f56b6..fe7e8e8750 100644 --- a/src/pc80/Makefile.inc +++ b/src/pc80/Makefile.inc @@ -8,3 +8,4 @@ initobj-$(CONFIG_CACHE_AS_RAM) += serial.o subdirs-y += vga $(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H) +$(obj)/pc80/mc146818rtc_early.initobj.o : $(OPTION_TABLE_H) diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c index 23b834c06a..d32b862317 100644 --- a/src/pc80/mc146818rtc.c +++ b/src/pc80/mc146818rtc.c @@ -2,6 +2,9 @@ #include <pc80/mc146818rtc.h> #include <boot/coreboot_tables.h> #include <string.h> +#if CONFIG_USE_OPTION_TABLE +#include <option_table.h> +#endif /* control registers - Moto names */ diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c index ed1f0926f0..9ffb440d1a 100644 --- a/src/pc80/mc146818rtc_early.c +++ b/src/pc80/mc146818rtc_early.c @@ -1,6 +1,10 @@ #include <pc80/mc146818rtc.h> #include <fallback.h> +#if CONFIG_USE_OPTION_TABLE +#include <option_table.h> +#endif + #ifndef CONFIG_MAX_REBOOT_CNT #error "CONFIG_MAX_REBOOT_CNT not defined" #endif |