diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-09-25 10:40:47 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-09-25 10:40:47 +0000 |
| commit | 10ec0fed8e3336d52ab35f8da91a2a9423d3e969 (patch) | |
| tree | f76e6ca8d7343970aec0d404d3ac96bea02df37e /src/northbridge/amd | |
| parent | ff492b18550d6e24cdaffbb265f2fecc294486a3 (diff) | |
- 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)
- Add double include guards around option_table.h defines
- 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@5838 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/northbridge/amd')
| -rw-r--r-- | src/northbridge/amd/amdk8/coherent_ht.c | 3 | ||||
| -rw-r--r-- | src/northbridge/amd/amdk8/raminit.c | 3 | ||||
| -rw-r--r-- | src/northbridge/amd/amdk8/raminit_f.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c index ad787caabd..f1f5bbc35c 100644 --- a/src/northbridge/amd/amdk8/coherent_ht.c +++ b/src/northbridge/amd/amdk8/coherent_ht.c @@ -69,6 +69,9 @@ #include <stdlib.h> #include "arch/romcc_io.h" #include <pc80/mc146818rtc.h> +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif #include "amdk8.h" diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index efb7738306..a48a835185 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -10,6 +10,9 @@ #include <reset.h> #include "raminit.h" #include "amdk8.h" +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif #if (CONFIG_RAMTOP & (CONFIG_RAMTOP -1)) != 0 # error "CONFIG_RAMTOP must be a power of 2" diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c index ff3eb3914d..916f04d67b 100644 --- a/src/northbridge/amd/amdk8/raminit_f.c +++ b/src/northbridge/amd/amdk8/raminit_f.c @@ -28,6 +28,9 @@ #include "raminit.h" #include "amdk8_f.h" #include <spd_ddr2.h> +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif #ifndef QRANK_DIMM_SUPPORT #define QRANK_DIMM_SUPPORT 0 |