diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-02-27 17:51:16 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-02-27 17:51:16 +0000 |
| commit | 678d6140a5f75bde7b5a6b7ef296ebb7a3dda166 (patch) | |
| tree | 6070fe742cda4fd4184ae1d26ecca852a974580c /src/cpu/amd | |
| parent | a85c0059f3fa5bdce6002f09e99fd70037552119 (diff) | |
| download | coreboot-678d6140a5f75bde7b5a6b7ef296ebb7a3dda166.tar.xz | |
This patch makes several CMOS/NVRAM reads dependent on whether there's a table to read. Otherwise you never know what you'll get from the factory BIOS. There are probably more, but these are the ones compiled into the s2895.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3959 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd')
| -rw-r--r-- | src/cpu/amd/dualcore/dualcore.c | 7 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/init_cpus.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/cpu/amd/dualcore/dualcore.c b/src/cpu/amd/dualcore/dualcore.c index 51ef6034f7..5a61fac699 100644 --- a/src/cpu/amd/dualcore/dualcore.c +++ b/src/cpu/amd/dualcore/dualcore.c @@ -56,9 +56,10 @@ static inline void start_other_cores(void) unsigned nodes; unsigned nodeid; - if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // disable dual_core - return; - } + if (HAVE_OPTION_TABLE && + read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { + return; // disable dual_core + } nodes = get_nodes(); diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c index e341b97b64..8b613a624e 100644 --- a/src/cpu/amd/model_fxx/init_cpus.c +++ b/src/cpu/amd/model_fxx/init_cpus.c @@ -72,7 +72,7 @@ static void for_each_ap(unsigned bsp_apicid, unsigned core_range, process_ap_t p nodes = get_nodes(); disable_siblings = !CONFIG_LOGICAL_CPUS; -#if CONFIG_LOGICAL_CPUS == 1 +#if CONFIG_LOGICAL_CPUS == 1 && HAVE_OPTION_TABLE == 1 if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // 0 mean dual core disable_siblings = 1; } |