3 files changed, 0 insertions, 62 deletions
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 1cb1e37919..f1b686198f 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -87,7 +87,6 @@ $(obj)/coreboot.a: $(objs)
 crt0s :=
 ldscripts :=
 ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscripts += $(src)/arch/i386/lib/failover.lds
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/entry16.inc
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds
@@ -160,12 +159,6 @@ crt0s += $(src)/cpu/x86/car/cache_as_ram.inc
 ldscripts += $(src)/cpu/x86/car/cache_as_ram.lds
 endif
 
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
-ifeq ($(CONFIG_ROMCC),y)
-crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/failover.inc
-endif
-endif
-
 ifeq ($(CONFIG_LLSHELL),y)
 crt0s += $(src)/arch/i386/llshell/llshell.inc
 endif
@@ -196,10 +189,6 @@ endif
 ifeq ($(CONFIG_ROMCC),y)
 ROMCCFLAGS ?= -mcpu=p2 -O2
 
-$(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib/failover.c
-	printf "    ROMCC      failover.inc\n"
-	$(obj)/romcc $(ROMCCFLAGS) --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h
 	printf "    ROMCC      romstage.inc\n"
 	$(obj)/romcc $(ROMCCFLAGS) -include $(obj)/build.h $(INCLUDES) $< -o $@
diff --git a/src/arch/i386/lib/failover.c b/src/arch/i386/lib/failover.c
deleted file mode 100644
index 7beee8af4e..0000000000
--- a/src/arch/i386/lib/failover.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
- * 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
-#define __PRE_RAM__
-
-#include <arch/io.h>
-#include "arch/romcc_io.h"
-#include "pc80/mc146818rtc_early.c"
-
-/**
- * Check whether the normal or the fallback image should be booted
- * (by reading the proper flag from CMOS), and boot it.
- *
- * @param bist The input BIST value.
- * @return The BIST value.
- */
-static unsigned long main(unsigned long bist)
-{
-	if (do_normal_boot())
-		goto normal_image;
-	else
-		goto fallback_image;
-
-normal_image:
-	__asm__ __volatile__("jmp __normal_image" : : "a" (bist) : );
-
-cpu_reset:
-	__asm__ __volatile__("jmp __cpu_reset" : : "a" (bist) : );
-
-fallback_image:
-	return bist;
-}
diff --git a/src/arch/i386/lib/failover.lds b/src/arch/i386/lib/failover.lds
deleted file mode 100644
index 25f3200911..0000000000
--- a/src/arch/i386/lib/failover.lds
+++ /dev/null
@@ -1 +0,0 @@
-	__normal_image = (CONFIG_ROMBASE & 0xfffffff0) - 8;