From 3be4bc88fabf1a19cec38e5dbea515f1ddeb4be9 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 11 Oct 2008 16:10:54 +0000 Subject: 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 Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3649 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/digitallogic/adl855pc/Config.lb | 8 +++---- src/mainboard/digitallogic/adl855pc/failover.c | 32 ------------------------- src/mainboard/digitallogic/msm586seg/Config.lb | 8 +++---- src/mainboard/digitallogic/msm586seg/failover.c | 32 ------------------------- src/mainboard/digitallogic/msm800sev/failover.c | 32 ------------------------- 5 files changed, 8 insertions(+), 104 deletions(-) delete mode 100644 src/mainboard/digitallogic/adl855pc/failover.c delete mode 100644 src/mainboard/digitallogic/msm586seg/failover.c delete mode 100644 src/mainboard/digitallogic/msm800sev/failover.c (limited to 'src/mainboard/digitallogic') diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb index 3932903e33..a6680444a0 100644 --- 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 index bdcb9eaed2..0000000000 --- a/src/mainboard/digitallogic/adl855pc/failover.c +++ /dev/null @@ -1,32 +0,0 @@ -#define ASSEMBLY 1 -#include -#include -#include -#include -#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 235d3b0fc7..8be6b6195d 100644 --- 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 index bdcb9eaed2..0000000000 --- a/src/mainboard/digitallogic/msm586seg/failover.c +++ /dev/null @@ -1,32 +0,0 @@ -#define ASSEMBLY 1 -#include -#include -#include -#include -#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 index bdcb9eaed2..0000000000 --- a/src/mainboard/digitallogic/msm800sev/failover.c +++ /dev/null @@ -1,32 +0,0 @@ -#define ASSEMBLY 1 -#include -#include -#include -#include -#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; -} -- cgit v1.2.3