From eb50c7d922e91f0247b3705eccb2d2eec638c277 Mon Sep 17 00:00:00 2001 From: Edwin Beasant Date: Tue, 6 Jul 2010 21:05:04 +0000 Subject: Re-integrate "USE_OPTION_TABLE" code. Signed-off-by: Edwin Beasant Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/model_10xxx/init_cpus.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/cpu/amd/model_10xxx') diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c index 48a32f8e26..43a62256f5 100644 --- a/src/cpu/amd/model_10xxx/init_cpus.c +++ b/src/cpu/amd/model_10xxx/init_cpus.c @@ -109,13 +109,12 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range, process_ap_t process_ap, /* get_nodes define in ht_wrapper.c */ nodes = get_nodes(); - disable_siblings = !CONFIG_LOGICAL_CPUS; - -#if CONFIG_LOGICAL_CPUS == 1 && CONFIG_HAVE_OPTION_TABLE == 1 - if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core + if (!CONFIG_LOGICAL_CPUS || + read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 means multi core disable_siblings = 1; + } else { + disable_siblings = 0; } -#endif /* Assume that all node are same stepping, otherwise we can use use nb_cfg_54 from bsp for all nodes */ -- cgit v1.2.3