don't wait core0 started twice

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2295 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/amd/serengeti_leopard/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_leopard/cache_as_ram_auto.c
index 965e439f499fe44744d4aa8fa19a17451ec5c2ae..c31e9e6dabe2dc891c70310d0f186a78281c7fd9 100644 (file)
--- a/src/mainboard/amd/serengeti_leopard/cache_as_ram_auto.c
+++ b/src/mainboard/amd/serengeti_leopard/cache_as_ram_auto.c
@@ -241,13 +241,13 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
 #endif
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+       wait_all_core0_started();       
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+       wait_all_other_cores_started(bsp_apicid);
 #endif
-       wait_all_aps_started(bsp_apicid);
 
         needs_reset |= ht_setup_chains_x();
 

diff --git a/src/mainboard/tyan/s2881/cache_as_ram_auto.c b/src/mainboard/tyan/s2881/cache_as_ram_auto.c
index 67a32140ad75f21c44b2048204695431e940a740..50c543592bd0572bfcf08bda85e0f794b3cd6133 100644 (file)
--- a/src/mainboard/tyan/s2881/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2881/cache_as_ram_auto.c
@@ -181,15 +181,14 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
         setup_s2881_resource_map();
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
 
-        wait_all_aps_started(bsp_apicid);
-
         needs_reset |= ht_setup_chains_x();
 
                if (needs_reset) {

diff --git a/src/mainboard/tyan/s2885/cache_as_ram_auto.c b/src/mainboard/tyan/s2885/cache_as_ram_auto.c
index 0c5792565c68ee07c953be803d5a1b7c43b0629b..13b66d8dc5c08e4acfc2fb0562b32dfe69b5b6ec 100644 (file)
--- a/src/mainboard/tyan/s2885/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2885/cache_as_ram_auto.c
@@ -181,15 +181,14 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
         setup_s2885_resource_map();
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
-
-        wait_all_aps_started(bsp_apicid);
-
+       
         needs_reset |= ht_setup_chains_x();
 
                if (needs_reset) {

diff --git a/src/mainboard/tyan/s2891/cache_as_ram_auto.c b/src/mainboard/tyan/s2891/cache_as_ram_auto.c
index 1bc29d930425603d63986f5238c64dc697b2de87..b83839a19cfc7ea027c00f773a94bdb6b104f839 100644 (file)
--- a/src/mainboard/tyan/s2891/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2891/cache_as_ram_auto.c
@@ -197,15 +197,14 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
         setup_s2891_resource_map();
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
 
-        wait_all_aps_started(bsp_apicid);
-
         needs_reset |= ht_setup_chains_x();
 
         needs_reset |= ck804_early_setup_x();

diff --git a/src/mainboard/tyan/s2892/cache_as_ram_auto.c b/src/mainboard/tyan/s2892/cache_as_ram_auto.c
index 1936563518031a19d9f7dcd976eb969249ea2b6d..6352fdf6e983871673863cee16ddde8960cae966 100644 (file)
--- a/src/mainboard/tyan/s2892/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2892/cache_as_ram_auto.c
@@ -206,10 +206,12 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
         setup_s2892_resource_map();
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
 
         needs_reset |= ht_setup_chains_x();

diff --git a/src/mainboard/tyan/s2895/cache_as_ram_auto.c b/src/mainboard/tyan/s2895/cache_as_ram_auto.c
index 00bf1a6c233567a874b74e6a0d14ae45c9d0ba4b..299f345b7172529daa47e85079fb367eab106f22 100644 (file)
--- a/src/mainboard/tyan/s2895/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2895/cache_as_ram_auto.c
@@ -240,14 +240,13 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        needs_reset = setup_coherent_ht_domain();
 
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
 
-        wait_all_aps_started(bsp_apicid);
-
         needs_reset |= ht_setup_chains_x();
 
         needs_reset |= ck804_early_setup_x();

diff --git a/src/mainboard/tyan/s4882/cache_as_ram_auto.c b/src/mainboard/tyan/s4882/cache_as_ram_auto.c
index 2b463d4d27490b48f44bfd141e2d4e07d7843708..00378dfb9b823040ab175fe9d13590ca5b1ebe74 100644 (file)
--- a/src/mainboard/tyan/s4882/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s4882/cache_as_ram_auto.c
@@ -219,15 +219,14 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
         setup_s4882_resource_map();
 
        needs_reset = setup_coherent_ht_domain();
-       
+
+        wait_all_core0_started();
 #if CONFIG_LOGICAL_CPUS==1
         // It is said that we should start core1 after all core0 launched
-       wait_all_core0_started();
         start_other_cores();
+        wait_all_other_cores_started(bsp_apicid);
 #endif
 
-        wait_all_aps_started(bsp_apicid);
-
        // automatically set that for you, but you might meet tight space
         needs_reset |= ht_setup_chains_x();