[commit] r5258 - in trunk/src/mainboard: amd/dbm690t amd/mahogany amd/mahogany_fam10 amd/pistachio amd/serengeti_cheetah amd/serengeti_cheetah_fam10 arima/hdama asus/a8n_e asus/a8v-e_se broadcom/bl...

[repository service]

Author: oxygene
Date: Thu Mar 18 17:46:50 2010
New Revision: 5258
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5258

Log:
Rework boolean expression (DeMorgan and all) for
better readability.
Also remove failover.c files in mainboards, as they're
not used anymore (and useless, too)

Signed-off-by: Patrick Georgi 
Acked-by: Myles Watson 
Acked-by: Peter Stuge

Deleted:
   trunk/src/mainboard/dell/s1850/failover.c
   trunk/src/mainboard/emulation/qemu-x86/failover.c
   trunk/src/mainboard/intel/jarrell/failover.c
   trunk/src/mainboard/intel/xe7501devkit/failover.c
   trunk/src/mainboard/olpc/btest/failover.c
   trunk/src/mainboard/olpc/rev_a/failover.c
   trunk/src/mainboard/supermicro/x6dai_g/failover.c
   trunk/src/mainboard/supermicro/x6dhe_g/failover.c
   trunk/src/mainboard/supermicro/x6dhe_g2/failover.c
   trunk/src/mainboard/supermicro/x6dhr_ig/failover.c
   trunk/src/mainboard/supermicro/x6dhr_ig2/failover.c
   trunk/src/mainboard/via/epia-m/failover.c
   trunk/src/mainboard/via/epia-n/failover.c
Modified:
   trunk/src/mainboard/amd/dbm690t/romstage.c
   trunk/src/mainboard/amd/mahogany/romstage.c
   trunk/src/mainboard/amd/mahogany_fam10/romstage.c
   trunk/src/mainboard/amd/pistachio/romstage.c
   trunk/src/mainboard/amd/serengeti_cheetah/romstage.c
   trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
   trunk/src/mainboard/arima/hdama/romstage.c
   trunk/src/mainboard/asus/a8n_e/romstage.c
   trunk/src/mainboard/asus/a8v-e_se/romstage.c
   trunk/src/mainboard/broadcom/blast/romstage.c
   trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
   trunk/src/mainboard/gigabyte/m57sli/romstage.c
   trunk/src/mainboard/hp/dl145_g3/romstage.c
   trunk/src/mainboard/ibm/e325/romstage.c
   trunk/src/mainboard/ibm/e326/romstage.c
   trunk/src/mainboard/iwill/dk8_htx/romstage.c
   trunk/src/mainboard/iwill/dk8s2/romstage.c
   trunk/src/mainboard/iwill/dk8x/romstage.c
   trunk/src/mainboard/kontron/kt690/romstage.c
   trunk/src/mainboard/msi/ms7135/romstage.c
   trunk/src/mainboard/msi/ms7260/romstage.c
   trunk/src/mainboard/msi/ms9185/romstage.c
   trunk/src/mainboard/msi/ms9282/romstage.c
   trunk/src/mainboard/msi/ms9652_fam10/romstage.c
   trunk/src/mainboard/newisys/khepri/romstage.c
   trunk/src/mainboard/nvidia/l1_2pvv/romstage.c
   trunk/src/mainboard/sunw/ultra40/romstage.c
   trunk/src/mainboard/supermicro/h8dme/romstage.c
   trunk/src/mainboard/supermicro/h8dmr/romstage.c
   trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c
   trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c
   trunk/src/mainboard/technexion/tim5690/romstage.c
   trunk/src/mainboard/technexion/tim8690/romstage.c
   trunk/src/mainboard/tyan/s2850/romstage.c
   trunk/src/mainboard/tyan/s2875/romstage.c
   trunk/src/mainboard/tyan/s2880/romstage.c
   trunk/src/mainboard/tyan/s2881/romstage.c
   trunk/src/mainboard/tyan/s2882/romstage.c
   trunk/src/mainboard/tyan/s2885/romstage.c
   trunk/src/mainboard/tyan/s2891/romstage.c
   trunk/src/mainboard/tyan/s2892/romstage.c
   trunk/src/mainboard/tyan/s2895/romstage.c
   trunk/src/mainboard/tyan/s2912/romstage.c
   trunk/src/mainboard/tyan/s2912_fam10/romstage.c
   trunk/src/mainboard/tyan/s4880/romstage.c
   trunk/src/mainboard/tyan/s4882/romstage.c

Modified: trunk/src/mainboard/amd/dbm690t/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/dbm690t/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -111,7 +111,7 @@
    struct cpuid_result cpuid1;
    struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/amd/mahogany/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/mahogany/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -111,7 +111,7 @@
    struct cpuid_result cpuid1;
    struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -156,7 +156,7 @@
    u32 val;
    msr_t msr;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	/* mov bsp to bus 0xff when > 8 nodes */

Modified: trunk/src/mainboard/amd/pistachio/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/pistachio/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/pistachio/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -107,7 +107,7 @@
        (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE -
    			CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -189,7 +189,7 @@
    struct cpuid_result cpuid1;
 #endif

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -160,7 +160,7 @@
    u32 val;
    msr_t msr;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	/* mov bsp to bus 0xff when > 8 nodes */

Modified: trunk/src/mainboard/arima/hdama/romstage.c
==============================================================================
--- trunk/src/mainboard/arima/hdama/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/arima/hdama/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -114,7 +114,7 @@
    struct mem_controller ctrl[8];
    unsigned nodes;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/asus/a8n_e/romstage.c
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/asus/a8n_e/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -134,7 +134,7 @@
    unsigned nodes, bsp_apicid = 0;
    struct mem_controller ctrl[8];

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/asus/a8v-e_se/romstage.c
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/asus/a8v-e_se/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -201,7 +201,7 @@
    print_info("now booting... fallback\r\n");

/* Is this a CPU only reset? Or is this a secondary CPU? */
-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0. */
    	/* Allow the HT devices to be found. */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/broadcom/blast/romstage.c
==============================================================================
--- trunk/src/mainboard/broadcom/blast/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/broadcom/blast/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -125,7 +125,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {  
+        if (!cpu_init_detectedx && boot_cpu()) {  
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -193,7 +193,7 @@
         int needs_reset = 0;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/gigabyte/m57sli/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -194,7 +194,7 @@
         unsigned bsp_apicid = 0;
    uint8_t tmp = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c
==============================================================================
--- trunk/src/mainboard/hp/dl145_g3/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/hp/dl145_g3/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -216,7 +216,7 @@
     int needs_reset;
     unsigned bsp_apicid = 0;

-	 if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	 if (!cpu_init_detectedx && boot_cpu()) {
    	 /* Nothing special needs to be done to find bus 0 */
    	 /* Allow the HT devices to be found */

Modified: trunk/src/mainboard/ibm/e325/romstage.c
==============================================================================
--- trunk/src/mainboard/ibm/e325/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/ibm/e325/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -123,7 +123,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/ibm/e326/romstage.c
==============================================================================
--- trunk/src/mainboard/ibm/e326/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/ibm/e326/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -122,7 +122,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/iwill/dk8_htx/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -154,7 +154,7 @@
         int needs_reset; int i;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8s2/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/iwill/dk8s2/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -154,7 +154,7 @@
         int needs_reset; int i;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/iwill/dk8x/romstage.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8x/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/iwill/dk8x/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -154,7 +154,7 @@
         int needs_reset; int i;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/kontron/kt690/romstage.c
==============================================================================
--- trunk/src/mainboard/kontron/kt690/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/kontron/kt690/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -113,7 +113,7 @@
    struct cpuid_result cpuid1;
    struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/msi/ms7135/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms7135/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/msi/ms7135/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -137,7 +137,7 @@
    struct mem_controller ctrl[8];
    unsigned nodes;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/msi/ms7260/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms7260/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/msi/ms7260/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -170,7 +170,7 @@
    int needs_reset = 0;
    unsigned bsp_apicid = 0;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0. */
    	/* Allow the HT devices to be found. */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/msi/ms9185/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms9185/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/msi/ms9185/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -174,7 +174,7 @@
         int needs_reset;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/msi/ms9282/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms9282/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/msi/ms9282/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -175,7 +175,7 @@
        struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);
        char *p ;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -178,7 +178,7 @@
    u32 wants_reset;
    msr_t msr;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/newisys/khepri/romstage.c
==============================================================================
--- trunk/src/mainboard/newisys/khepri/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/newisys/khepri/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -128,7 +128,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -192,7 +192,7 @@
    int needs_reset = 0;
    unsigned bsp_apicid = 0;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/sunw/ultra40/romstage.c
==============================================================================
--- trunk/src/mainboard/sunw/ultra40/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/sunw/ultra40/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -161,7 +161,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/supermicro/h8dme/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -252,7 +252,7 @@
    int needs_reset = 0;
    unsigned bsp_apicid = 0;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/supermicro/h8dmr/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -185,7 +185,7 @@
         int needs_reset = 0;
         unsigned bsp_apicid = 0;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -177,7 +177,7 @@
    u32 wants_reset;
    msr_t msr;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -220,7 +220,7 @@
    u32 wants_reset;
    msr_t msr;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/technexion/tim5690/romstage.c
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/technexion/tim5690/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -114,7 +114,7 @@
    struct cpuid_result cpuid1;
    struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/technexion/tim8690/romstage.c
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/technexion/tim8690/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -112,7 +112,7 @@
    struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */
    	enumerate_ht_chain();

Modified: trunk/src/mainboard/tyan/s2850/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2850/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2850/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -112,7 +112,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2875/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2875/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2875/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -114,7 +114,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2880/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2880/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2880/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -115,7 +115,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2881/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2881/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2881/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -118,7 +118,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2882/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2882/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2882/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -118,7 +118,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2885/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2885/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2885/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -118,7 +118,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2891/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2891/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2891/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -127,7 +127,7 @@
    struct mem_controller ctrl[8];
    unsigned nodes;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2892/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2892/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2892/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -116,7 +116,7 @@
    struct mem_controller ctrl[8];
    unsigned nodes;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2895/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2895/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2895/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -166,7 +166,7 @@
    struct mem_controller ctrl[8];
    unsigned nodes;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2912/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2912/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2912/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -192,7 +192,7 @@
    int needs_reset = 0;
    unsigned bsp_apicid = 0;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -182,7 +182,7 @@
    u32 wants_reset;
    msr_t msr;

-	if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+	if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s4880/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s4880/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s4880/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -165,7 +165,7 @@

int needs_reset;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */

Modified: trunk/src/mainboard/tyan/s4882/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s4882/romstage.c	Thu Mar 18 17:18:58 2010	(r5257)
+++ trunk/src/mainboard/tyan/s4882/romstage.c	Thu Mar 18 17:46:50 2010	(r5258)
@@ -145,7 +145,7 @@
         struct mem_controller ctrl[8];
         unsigned nodes;

-        if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+        if (!cpu_init_detectedx && boot_cpu()) {
    	/* Nothing special needs to be done to find bus 0 */
    	/* Allow the HT devices to be found */