summaryrefslogtreecommitdiff
path: root/src/arch/i386/init/bootblock_normal.c
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-02-24 13:58:23 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-02-24 13:58:23 +0000
commitc9fa96d04c85430c7397473b2995f8f4913beb9c (patch)
treeae5557338f4144ec069ae1c28869f22d3805121b /src/arch/i386/init/bootblock_normal.c
parentd3428b071e256f0b09f40ef3d18837749401b6f8 (diff)
downloadcoreboot-c9fa96d04c85430c7397473b2995f8f4913beb9c.tar.xz
Enable user selectable bootblocks, and provide a bootblock that
selects between "fallback" and "normal", in addition to the already present "fallback"-only bootblock. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5157 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386/init/bootblock_normal.c')
-rw-r--r--src/arch/i386/init/bootblock_normal.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/arch/i386/init/bootblock_normal.c b/src/arch/i386/init/bootblock_normal.c
new file mode 100644
index 0000000000..0e5bd25556
--- /dev/null
+++ b/src/arch/i386/init/bootblock_normal.c
@@ -0,0 +1,29 @@
+#include <bootblock_common.h>
+
+#include <arch/io.h>
+#include "arch/romcc_io.h"
+#include "pc80/mc146818rtc_early.c"
+
+static void main(unsigned long bist)
+{
+ if (boot_cpu()) {
+ bootblock_northbridge_init();
+ bootblock_southbridge_init();
+ }
+
+ unsigned long entry;
+ if (do_normal_boot())
+ entry = findstage("normal/romstage");
+ else
+ entry = findstage("fallback/romstage");
+
+ if (entry) call(entry, bist);
+
+ /* run fallback if normal can't be found */
+ entry = findstage("fallback/romstage");
+ if (entry) call(entry, bist);
+
+ /* duh. we're stuck */
+ asm volatile ("1:\n\thlt\n\tjmp 1b\n\t");
+}
+