Drop a number of duplicated failover.c files (they have the same content

as the global src/arch/i386/lib/failover.c file).

Also, drop a number of dummy failover.c files which are not even used at all.

This is abuild-tested by me.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3649 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/amd/db800/failover.c b/src/mainboard/amd/db800/failover.c
deleted file mode 100644 (file)
index f216d53..0000000
--- a/src/mainboard/amd/db800/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#define ASSEMBLY 1
-
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
-       return bist;
-}

diff --git a/src/mainboard/amd/norwich/failover.c b/src/mainboard/amd/norwich/failover.c
deleted file mode 100644 (file)
index f216d53..0000000
--- a/src/mainboard/amd/norwich/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#define ASSEMBLY 1
-
-#include <stdint.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <arch/io.h>
-#include "pc80/mc146818rtc_early.c"
-
-static unsigned long main(unsigned long bist)
-{
-       return bist;
-}

diff --git a/src/mainboard/amd/rumba/Config.lb b/src/mainboard/amd/rumba/Config.lb
index e8f7fe818b682aed56b9291ce46fa2855cb41718..4ffb3b2046b587520ff3f7fab051ed262bc68613 100644 (file)
--- a/src/mainboard/amd/rumba/Config.lb
+++ b/src/mainboard/amd/rumba/Config.lb
@@ -51,13 +51,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/amd/rumba/failover.c b/src/mainboard/amd/rumba/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/amd/rumba/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/artecgroup/dbe61/failover.c b/src/mainboard/artecgroup/dbe61/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/artecgroup/dbe61/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/asi/mb_5blmp/Config.lb b/src/mainboard/asi/mb_5blmp/Config.lb
index 1dc219261906124763315979762468b54ab61a48..8762641f447b6c5c7ddfe11ca77565e22b40628a 100644 (file)
--- a/src/mainboard/asi/mb_5blmp/Config.lb
+++ b/src/mainboard/asi/mb_5blmp/Config.lb
@@ -52,13 +52,13 @@ end
 ## Romcc output
 ##
 # makerule ./failover.E
-#      depends "$(MAINBOARD)/failover.c ../romcc" 
-#      action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+#      depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+#      action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 # end
 # 
 # makerule ./failover.inc
-#      depends "$(MAINBOARD)/failover.c ../romcc"
-#      action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+#      depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+#      action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 # end
 
 makerule ./auto.E 

diff --git a/src/mainboard/asus/mew-vm/Config.lb b/src/mainboard/asus/mew-vm/Config.lb
index cdd98f56a3607d55b0cc8754b9f69fd8fcf7cb26..997b71d82d052b71c294f884accef745ba5ffeec 100644 (file)
--- a/src/mainboard/asus/mew-vm/Config.lb
+++ b/src/mainboard/asus/mew-vm/Config.lb
@@ -51,13 +51,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/asus/mew-vm/failover.c b/src/mainboard/asus/mew-vm/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/asus/mew-vm/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb
index 3932903e336ac6ea93464ae7a964e69bdf704b95..a6680444a0ee7c5ce4407a217047b63acee59dc3 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/Config.lb
+++ b/src/mainboard/digitallogic/adl855pc/Config.lb
@@ -50,13 +50,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/digitallogic/adl855pc/failover.c b/src/mainboard/digitallogic/adl855pc/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/digitallogic/adl855pc/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb
index 235d3b0fc78bcb9e1812a3345f0d983e4e163087..8be6b6195d52be05b8bdcdd6b8291b5b8d1e0d0d 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/Config.lb
+++ b/src/mainboard/digitallogic/msm586seg/Config.lb
@@ -52,13 +52,13 @@ object reset.o
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/digitallogic/msm586seg/failover.c b/src/mainboard/digitallogic/msm586seg/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/digitallogic/msm586seg/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/digitallogic/msm800sev/failover.c b/src/mainboard/digitallogic/msm800sev/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/digitallogic/msm800sev/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/eaglelion/5bcm/Config.lb b/src/mainboard/eaglelion/5bcm/Config.lb
index 8f21b18405211d0670e2ba1eb1d626dbdedd2c43..595845c7b9c2ea2a5963fb68e78baeb242f2bb4d 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/Config.lb
+++ b/src/mainboard/eaglelion/5bcm/Config.lb
@@ -51,13 +51,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/eaglelion/5bcm/failover.c b/src/mainboard/eaglelion/5bcm/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/eaglelion/5bcm/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/iei/juki-511p/Config.lb b/src/mainboard/iei/juki-511p/Config.lb
index 6f9fbab8259d176221cdc53e1129a54578a05b4c..345f9815104f63c7332e1d8c72e5ea54fd7d1a12 100644 (file)
--- a/src/mainboard/iei/juki-511p/Config.lb
+++ b/src/mainboard/iei/juki-511p/Config.lb
@@ -47,13 +47,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/iei/juki-511p/failover.c b/src/mainboard/iei/juki-511p/failover.c
deleted file mode 100644 (file)
index 9b9b30e..0000000
--- a/src/mainboard/iei/juki-511p/failover.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Nikolay Petukhov <nikolay.petukhov@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#define ASSEMBLY 1
-
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
-normal_image:
-       asm volatile ("jmp __normal_image"
-               : /* outputs */
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
-cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
-fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/lippert/frontrunner/Config.lb b/src/mainboard/lippert/frontrunner/Config.lb
index 6ef7bb4e8e30abe36f5a4cc2d4a8b9308eba5bb6..7dfa0ac5569815244c864d0665ae5bb9f83ce99d 100644 (file)
--- a/src/mainboard/lippert/frontrunner/Config.lb
+++ b/src/mainboard/lippert/frontrunner/Config.lb
@@ -51,13 +51,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/lippert/frontrunner/failover.c b/src/mainboard/lippert/frontrunner/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/lippert/frontrunner/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/pcengines/alix1c/failover.c b/src/mainboard/pcengines/alix1c/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/pcengines/alix1c/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/technologic/ts5300/Config.lb b/src/mainboard/technologic/ts5300/Config.lb
index 864347214e0bb91d7e57229451215241d9214375..b9ea9bf5c2996ca99fa4e9f5b532ec4300fa5a33 100644 (file)
--- a/src/mainboard/technologic/ts5300/Config.lb
+++ b/src/mainboard/technologic/ts5300/Config.lb
@@ -52,13 +52,13 @@ object reset.o
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/technologic/ts5300/failover.c b/src/mainboard/technologic/ts5300/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/technologic/ts5300/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}

diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb
index 516255d85431734a273841a20b155652a44f4859..0ccd060a89208528ca2a21c0c3aec5974ada580d 100644 (file)
--- a/src/mainboard/via/epia/Config.lb
+++ b/src/mainboard/via/epia/Config.lb
@@ -50,13 +50,13 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-       depends "$(MAINBOARD)/failover.c ../romcc" 
-       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc" 
+       action "../romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./failover.inc
-       depends "$(MAINBOARD)/failover.c ../romcc"
-       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
+       depends "$(MAINBOARD)/../../../arch/i386/lib/failover.c ../romcc"
+       action "../romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../arch/i386/lib/failover.c -o $@"
 end
 
 makerule ./auto.E 

diff --git a/src/mainboard/via/epia/failover.c b/src/mainboard/via/epia/failover.c
deleted file mode 100644 (file)
index bdcb9ea..0000000
--- a/src/mainboard/via/epia/failover.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#define ASSEMBLY 1
-#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)
-{
-       /* This is the primary cpu how should I boot? */
-       if (do_normal_boot()) {
-               goto normal_image;
-       }
-       else {
-               goto fallback_image;
-       }
- normal_image:
-       asm volatile ("jmp __normal_image" 
-               : /* outputs */ 
-               : "a" (bist) /* inputs */
-               : /* clobbers */
-               );
- cpu_reset:
-       asm volatile ("jmp __cpu_reset"
-               : /* outputs */ 
-               : "a"(bist) /* inputs */
-               : /* clobbers */
-               );
- fallback_image:
-       return bist;
-}