Am 18.03.2010 17:09, schrieb Myles Watson:
>
>> It's abuild tested and boot-tested with kontron/986lcd-m (which is
>> affected due to the changes in src/cpu/intel)
>>
>> + if (!((cpu_init_detectedx) || (!boot_cpu()))) {
>
> Maybe in a follow-up patch this could become:
> + if (!cpu_init_detectedx && boot_cpu()) {
Like this?
I also removed the failover.c files, which aren't used anymore (and were
pretty useless after the cleanup anyway)
Signed-off-by: Patrick Georgi <[email protected]>
Index: src/mainboard/iwill/dk8_htx/romstage.c
===================================================================
--- src/mainboard/iwill/dk8_htx/romstage.c (revision 5256)
+++ src/mainboard/iwill/dk8_htx/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/iwill/dk8s2/romstage.c
===================================================================
--- src/mainboard/iwill/dk8s2/romstage.c (revision 5256)
+++ src/mainboard/iwill/dk8s2/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/iwill/dk8x/romstage.c
===================================================================
--- src/mainboard/iwill/dk8x/romstage.c (revision 5256)
+++ src/mainboard/iwill/dk8x/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/broadcom/blast/romstage.c
===================================================================
--- src/mainboard/broadcom/blast/romstage.c (revision 5257)
+++ src/mainboard/broadcom/blast/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/supermicro/x6dai_g/failover.c
===================================================================
--- src/mainboard/supermicro/x6dai_g/failover.c (revision 5256)
+++ src/mainboard/supermicro/x6dai_g/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7525/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/supermicro/h8dmr/romstage.c
===================================================================
--- src/mainboard/supermicro/h8dmr/romstage.c (revision 5256)
+++ src/mainboard/supermicro/h8dmr/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/supermicro/x6dhe_g/failover.c
===================================================================
--- src/mainboard/supermicro/x6dhe_g/failover.c (revision 5256)
+++ src/mainboard/supermicro/x6dhe_g/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/supermicro/h8dme/romstage.c
===================================================================
--- src/mainboard/supermicro/h8dme/romstage.c (revision 5256)
+++ src/mainboard/supermicro/h8dme/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/supermicro/h8dmr_fam10/romstage.c
===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/romstage.c (revision 5256)
+++ src/mainboard/supermicro/h8dmr_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/supermicro/h8qme_fam10/romstage.c
===================================================================
--- src/mainboard/supermicro/h8qme_fam10/romstage.c (revision 5256)
+++ src/mainboard/supermicro/h8qme_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/supermicro/x6dhe_g2/failover.c
===================================================================
--- src/mainboard/supermicro/x6dhe_g2/failover.c (revision 5256)
+++ src/mainboard/supermicro/x6dhe_g2/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/supermicro/x6dhr_ig/failover.c
===================================================================
--- src/mainboard/supermicro/x6dhr_ig/failover.c (revision 5256)
+++ src/mainboard/supermicro/x6dhr_ig/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/supermicro/x6dhr_ig2/failover.c
===================================================================
--- src/mainboard/supermicro/x6dhr_ig2/failover.c (revision 5256)
+++ src/mainboard/supermicro/x6dhr_ig2/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/kontron/kt690/romstage.c
===================================================================
--- src/mainboard/kontron/kt690/romstage.c (revision 5257)
+++ src/mainboard/kontron/kt690/romstage.c (working copy)
@@ -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();
Index: src/mainboard/gigabyte/m57sli/romstage.c
===================================================================
--- src/mainboard/gigabyte/m57sli/romstage.c (revision 5256)
+++ src/mainboard/gigabyte/m57sli/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/gigabyte/ga_2761gxdk/romstage.c
===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/romstage.c (revision 5256)
+++ src/mainboard/gigabyte/ga_2761gxdk/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/emulation/qemu-x86/failover.c
===================================================================
--- src/mainboard/emulation/qemu-x86/failover.c (revision 5256)
+++ src/mainboard/emulation/qemu-x86/failover.c (working copy)
@@ -1,14 +0,0 @@
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-/* no code inclusion allowed */
-//#include "pc80/mc146818rtc_early.c"
-//#include "cpu/x86/lapic/boot_cpu.c"
-
-static void main(void)
-{
-}
-
Index: src/mainboard/olpc/btest/failover.c
===================================================================
--- src/mainboard/olpc/btest/failover.c (revision 5256)
+++ src/mainboard/olpc/btest/failover.c (working copy)
@@ -1,13 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/olpc/rev_a/failover.c
===================================================================
--- src/mainboard/olpc/rev_a/failover.c (revision 5256)
+++ src/mainboard/olpc/rev_a/failover.c (working copy)
@@ -1,13 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/amd/pistachio/romstage.c
===================================================================
--- src/mainboard/amd/pistachio/romstage.c (revision 5257)
+++ src/mainboard/amd/pistachio/romstage.c (working copy)
@@ -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();
Index: src/mainboard/amd/mahogany/romstage.c
===================================================================
--- src/mainboard/amd/mahogany/romstage.c (revision 5257)
+++ src/mainboard/amd/mahogany/romstage.c (working copy)
@@ -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();
Index: src/mainboard/amd/dbm690t/romstage.c
===================================================================
--- src/mainboard/amd/dbm690t/romstage.c (revision 5257)
+++ src/mainboard/amd/dbm690t/romstage.c (working copy)
@@ -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();
Index: src/mainboard/amd/serengeti_cheetah/romstage.c
===================================================================
--- src/mainboard/amd/serengeti_cheetah/romstage.c (revision 5256)
+++ src/mainboard/amd/serengeti_cheetah/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/amd/mahogany_fam10/romstage.c
===================================================================
--- src/mainboard/amd/mahogany_fam10/romstage.c (revision 5256)
+++ src/mainboard/amd/mahogany_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/romstage.c (revision 5256)
+++ src/mainboard/amd/serengeti_cheetah_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/hp/dl145_g3/romstage.c
===================================================================
--- src/mainboard/hp/dl145_g3/romstage.c (revision 5256)
+++ src/mainboard/hp/dl145_g3/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2912/romstage.c
===================================================================
--- src/mainboard/tyan/s2912/romstage.c (revision 5256)
+++ src/mainboard/tyan/s2912/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2850/romstage.c
===================================================================
--- src/mainboard/tyan/s2850/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2850/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2880/romstage.c
===================================================================
--- src/mainboard/tyan/s2880/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2880/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2881/romstage.c
===================================================================
--- src/mainboard/tyan/s2881/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2881/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s4880/romstage.c
===================================================================
--- src/mainboard/tyan/s4880/romstage.c (revision 5257)
+++ src/mainboard/tyan/s4880/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2891/romstage.c
===================================================================
--- src/mainboard/tyan/s2891/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2891/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2882/romstage.c
===================================================================
--- src/mainboard/tyan/s2882/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2882/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2892/romstage.c
===================================================================
--- src/mainboard/tyan/s2892/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2892/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s4882/romstage.c
===================================================================
--- src/mainboard/tyan/s4882/romstage.c (revision 5257)
+++ src/mainboard/tyan/s4882/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2875/romstage.c
===================================================================
--- src/mainboard/tyan/s2875/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2875/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2885/romstage.c
===================================================================
--- src/mainboard/tyan/s2885/romstage.c (revision 5257)
+++ src/mainboard/tyan/s2885/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2895/romstage.c
===================================================================
--- src/mainboard/tyan/s2895/romstage.c (revision 5256)
+++ src/mainboard/tyan/s2895/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/tyan/s2912_fam10/romstage.c
===================================================================
--- src/mainboard/tyan/s2912_fam10/romstage.c (revision 5256)
+++ src/mainboard/tyan/s2912_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/via/epia-m/failover.c
===================================================================
--- src/mainboard/via/epia-m/failover.c (revision 5256)
+++ src/mainboard/via/epia-m/failover.c (working copy)
@@ -1,13 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/via/epia-n/failover.c
===================================================================
--- src/mainboard/via/epia-n/failover.c (revision 5256)
+++ src/mainboard/via/epia-n/failover.c (working copy)
@@ -1,13 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/dell/s1850/failover.c
===================================================================
--- src/mainboard/dell/s1850/failover.c (revision 5256)
+++ src/mainboard/dell/s1850/failover.c (working copy)
@@ -1,19 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- /* skip all this nonsense as we are not doing fallback yet */
- return bist;
-}
Index: src/mainboard/msi/ms7135/romstage.c
===================================================================
--- src/mainboard/msi/ms7135/romstage.c (revision 5256)
+++ src/mainboard/msi/ms7135/romstage.c (working copy)
@@ -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();
Index: src/mainboard/msi/ms9282/romstage.c
===================================================================
--- src/mainboard/msi/ms9282/romstage.c (revision 5257)
+++ src/mainboard/msi/ms9282/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/msi/ms9185/romstage.c
===================================================================
--- src/mainboard/msi/ms9185/romstage.c (revision 5257)
+++ src/mainboard/msi/ms9185/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/msi/ms9652_fam10/romstage.c
===================================================================
--- src/mainboard/msi/ms9652_fam10/romstage.c (revision 5256)
+++ src/mainboard/msi/ms9652_fam10/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/msi/ms7260/romstage.c
===================================================================
--- src/mainboard/msi/ms7260/romstage.c (revision 5256)
+++ src/mainboard/msi/ms7260/romstage.c (working copy)
@@ -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();
Index: src/mainboard/arima/hdama/romstage.c
===================================================================
--- src/mainboard/arima/hdama/romstage.c (revision 5257)
+++ src/mainboard/arima/hdama/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/sunw/ultra40/romstage.c
===================================================================
--- src/mainboard/sunw/ultra40/romstage.c (revision 5257)
+++ src/mainboard/sunw/ultra40/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/newisys/khepri/romstage.c
===================================================================
--- src/mainboard/newisys/khepri/romstage.c (revision 5257)
+++ src/mainboard/newisys/khepri/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/technexion/tim8690/romstage.c
===================================================================
--- src/mainboard/technexion/tim8690/romstage.c (revision 5257)
+++ src/mainboard/technexion/tim8690/romstage.c (working copy)
@@ -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();
Index: src/mainboard/technexion/tim5690/romstage.c
===================================================================
--- src/mainboard/technexion/tim5690/romstage.c (revision 5257)
+++ src/mainboard/technexion/tim5690/romstage.c (working copy)
@@ -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();
Index: src/mainboard/ibm/e326/romstage.c
===================================================================
--- src/mainboard/ibm/e326/romstage.c (revision 5257)
+++ src/mainboard/ibm/e326/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/ibm/e325/romstage.c
===================================================================
--- src/mainboard/ibm/e325/romstage.c (revision 5257)
+++ src/mainboard/ibm/e325/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/nvidia/l1_2pvv/romstage.c
===================================================================
--- src/mainboard/nvidia/l1_2pvv/romstage.c (revision 5256)
+++ src/mainboard/nvidia/l1_2pvv/romstage.c (working copy)
@@ -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 */
Index: src/mainboard/intel/xe7501devkit/failover.c
===================================================================
--- src/mainboard/intel/xe7501devkit/failover.c (revision 5256)
+++ src/mainboard/intel/xe7501devkit/failover.c (working copy)
@@ -1,17 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/mc146818rtc_early.c"
-#include "southbridge/intel/i82801cx/cmos_failover.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7501/reset_test.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/intel/jarrell/failover.c
===================================================================
--- src/mainboard/intel/jarrell/failover.c (revision 5256)
+++ src/mainboard/intel/jarrell/failover.c (working copy)
@@ -1,18 +0,0 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include <arch/romcc_io.h>
-#include <cpu/x86/lapic.h>
-#include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
-#include "pc80/mc146818rtc_early.c"
-#include "cpu/x86/lapic/boot_cpu.c"
-#include "northbridge/intel/e7520/memory_initialized.c"
-
-static unsigned long main(unsigned long bist)
-{
- return bist;
-}
Index: src/mainboard/asus/a8v-e_se/romstage.c
===================================================================
--- src/mainboard/asus/a8v-e_se/romstage.c (revision 5257)
+++ src/mainboard/asus/a8v-e_se/romstage.c (working copy)
@@ -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();
Index: src/mainboard/asus/a8n_e/romstage.c
===================================================================
--- src/mainboard/asus/a8n_e/romstage.c (revision 5256)
+++ src/mainboard/asus/a8n_e/romstage.c (working copy)
@@ -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();
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
