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/cpu/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/cpu/amd')
| -rw-r--r-- | src/cpu/amd/dualcore/dualcore.c | 3 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/init_cpus.c | 4 | ||||
| -rw-r--r-- | src/cpu/amd/quadcore/quadcore.c | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/cpu/amd/dualcore/dualcore.c b/src/cpu/amd/dualcore/dualcore.c index f13a62cbe7..b1894ce154 100644 --- a/src/cpu/amd/dualcore/dualcore.c +++ b/src/cpu/amd/dualcore/dualcore.c @@ -7,6 +7,9 @@ #include "cpu/amd/dualcore/dualcore_id.c" #include <pc80/mc146818rtc.h> +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif static inline unsigned get_core_num_in_bsp(unsigned nodeid) { diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c index d6f63933cb..fa0f8b4f3f 100644 --- a/src/cpu/amd/model_fxx/init_cpus.c +++ b/src/cpu/amd/model_fxx/init_cpus.c @@ -1,3 +1,7 @@ +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif + //it takes the CONFIG_ENABLE_APIC_EXT_ID and CONFIG_APIC_ID_OFFSET and CONFIG_LIFT_BSP_APIC_ID #ifndef SET_FIDVID #if CONFIG_K8_REV_F_SUPPORT == 0 diff --git a/src/cpu/amd/quadcore/quadcore.c b/src/cpu/amd/quadcore/quadcore.c index e0659892ef..3e5c197157 100644 --- a/src/cpu/amd/quadcore/quadcore.c +++ b/src/cpu/amd/quadcore/quadcore.c @@ -20,6 +20,9 @@ #include <console/console.h> #include <pc80/mc146818rtc.h> #include <northbridge/amd/amdht/ht_wrapper.c> +#if CONFIG_HAVE_OPTION_TABLE +#include "option_table.h" +#endif #ifndef SET_NB_CFG_54 #define SET_NB_CFG_54 1 |