Fix all warnings in the tree

[coreboot.git] / src / cpu / amd / model_fxx / init_cpus.c

diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index fb8fbaa9d29676047e41a1d6233cd9f665d782c4..d6f63933cbe16535e1b2b598d4d85e748c78b243 100644 (file)
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -36,13 +36,12 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range, process_ap_t process_ap,
        /* get_nodes define in in_coherent_ht.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
 
        /* here I assume that all node are same stepping, otherwise we can use use nb_cfg_54 from bsp for all nodes */
        nb_cfg_54 = read_nb_cfg_54();
@@ -179,12 +178,12 @@ static void wait_ap_started(u32 ap_apicid, void *gp)
        }
 }
 
-static void wait_all_aps_started(u32 bsp_apicid)
+void wait_all_aps_started(u32 bsp_apicid)
 {
        for_each_ap(bsp_apicid, 0, wait_ap_started, (void *)0);
 }
 
-static void wait_all_other_cores_started(u32 bsp_apicid)
+void wait_all_other_cores_started(u32 bsp_apicid)
 {
        // all aps other than core0
        printk(BIOS_DEBUG, "started ap apicid: ");
@@ -192,7 +191,7 @@ static void wait_all_other_cores_started(u32 bsp_apicid)
        printk(BIOS_DEBUG, "\n");
 }
 
-static void allow_all_aps_stop(u32 bsp_apicid)
+void allow_all_aps_stop(u32 bsp_apicid)
 {
        // allow aps to stop
 
@@ -327,7 +326,7 @@ static u32 is_core0_started(u32 nodeid)
        return htic;
 }
 
-static void wait_all_core0_started(void)
+void wait_all_core0_started(void)
 {
        /* When core0 is started, it will distingush_cpu_resets
         * So wait for that to finish */