diff options
| -rw-r--r-- | src/arch/i386/lib/failover.c | 49 | ||||
| -rw-r--r-- | src/mainboard/msi/ms6178/Config.lb | 8 |
2 files changed, 53 insertions, 4 deletions
diff --git a/src/arch/i386/lib/failover.c b/src/arch/i386/lib/failover.c new file mode 100644 index 0000000000..328f3547e2 --- /dev/null +++ b/src/arch/i386/lib/failover.c @@ -0,0 +1,49 @@ +/* + * This file is part of the LinuxBIOS 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 + +#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/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb index a7c4845b9b..383c7b1ad4 100644 --- a/src/mainboard/msi/ms6178/Config.lb +++ b/src/mainboard/msi/ms6178/Config.lb @@ -35,12 +35,12 @@ driver mainboard.o if HAVE_PIRQ_TABLE object irq_tables.o end # object reset.o makerule ./failover.E - depends "$(MAINBOARD)/../../../lib/failover.c ./romcc" - action "./romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../lib/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)/../../../lib/failover.c ./romcc" - action "./romcc -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/../../../lib/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 # depends "$(MAINBOARD)/auto.c option_table.h ./romcc" |