Changeset 5157

Timestamp:

Feb 24, 2010 2:58:23 PM (3 years ago)

Author:

oxygene

Message:

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@…>
Acked-by: Stefan Reinauer <stepan@…>

Location:

trunk/src/arch/i386

Files:

• Kconfig (modified) (1 diff)
• Makefile.bootblock.inc (moved) (moved from trunk/src/arch/i386/Makefile.tinybootblock.inc) (1 diff)
• Makefile.inc (modified) (1 diff)
• include/bootblock_common.h (moved) (moved from trunk/src/arch/i386/init/bootblock.c) (1 diff)
• init/bootblock_normal.c (copied) (copied from trunk/src/arch/i386/init/bootblock.c) (2 diffs)
• init/bootblock_simple.c (copied) (copied from trunk/src/arch/i386/init/bootblock.c) (1 diff)

trunk/src/arch/i386/Kconfig

@@ -50 +50 @@
         default y
 
+choice
+        prompt "Bootblock behaviour"
+        default BOOTBLOCK_SIMPLE
+        depends on TINY_BOOTBLOCK
+
+config BOOTBLOCK_SIMPLE
+        bool "Always load fallback"
+
+config BOOTBLOCK_NORMAL
+        bool "Switch to normal if CMOS says so"
+
+endchoice
+
+config BOOTBLOCK_SOURCE
+        string
+        default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
+        default "bootblock_normal.c" if BOOTBLOCK_NORMAL
+
 config UPDATE_IMAGE
         bool "Update existing coreboot.rom image"

trunk/src/arch/i386/Makefile.bootblock.inc

@@ -64 +64 @@
         $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/bootblock.c $(obj)/romcc
+$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(obj)/romcc
         $(obj)/romcc $(bootblock_romccflags) -O2 $(ROMCCFLAGS) $(INCLUDES) $< -o $@
 

trunk/src/arch/i386/Makefile.inc

@@ -96 +96 @@
 
 ifeq ($(CONFIG_TINY_BOOTBLOCK),y)
-include $(src)/arch/i386/Makefile.tinybootblock.inc
+include $(src)/arch/i386/Makefile.bootblock.inc
 else
 include $(src)/arch/i386/Makefile.bigbootblock.inc

trunk/src/arch/i386/include/bootblock_common.h

@@ -32 +32 @@
         asm volatile ("jmp *%0\n\t" : : "r" (addr), "a" (bist));
 }
-
-static void main(unsigned long bist)
-{
-        if (boot_cpu()) {
-                bootblock_northbridge_init();
-                bootblock_southbridge_init();
-        }
-        const char* target1 = "fallback/romstage";
-        unsigned long entry;
-        entry = findstage(target1);
-        if (entry) call(entry, bist);
-        asm volatile ("1:\n\thlt\n\tjmp 1b\n\t");
-}
-

trunk/src/arch/i386/init/bootblock_normal.c

@@ -1 @@
-#define __PRE_RAM__
-#if CONFIG_LOGICAL_CPUS && \
- (defined(CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT) || defined(CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT))
-#include <cpu/x86/lapic/boot_cpu.c>
-#else
-#define boot_cpu(x) 1
-#endif
+#include <bootblock_common.h>
 
-#ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
-#include CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
-#else
-static void bootblock_northbridge_init(void) { }
-#endif
-#ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
-#include CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
-#else
-static void bootblock_southbridge_init(void) { }
-#endif
-
-static unsigned long findstage(char* target)
-{
-        unsigned long entry;
-        asm volatile (
-                "mov $1f, %%esp\n\t"
-                "jmp walkcbfs\n\t"
-                "1:\n\t" : "=a" (entry) : "S" (target) : "ebx", "ecx", "edi", "esp");
-        return entry;
-}
-
-static void call(unsigned long addr, unsigned long bist)
-{
-        asm volatile ("jmp *%0\n\t" : : "r" (addr), "a" (bist));
-}
+#include <arch/io.h>
+#include "arch/romcc_io.h"
+#include "pc80/mc146818rtc_early.c"
 
 static void main(unsigned long bist)
@@ -39 +11 @@
                 bootblock_southbridge_init();
         }
-        const char* target1 = "fallback/romstage";
+
         unsigned long entry;
-        entry = findstage(target1);
+        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");
 }

trunk/src/arch/i386/init/bootblock_simple.c

@@ -1 @@
-#define __PRE_RAM__
-#if CONFIG_LOGICAL_CPUS && \
- (defined(CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT) || defined(CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT))
-#include <cpu/x86/lapic/boot_cpu.c>
-#else
-#define boot_cpu(x) 1
-#endif
-
-#ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
-#include CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
-#else
-static void bootblock_northbridge_init(void) { }
-#endif
-#ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
-#include CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
-#else
-static void bootblock_southbridge_init(void) { }
-#endif
-
-static unsigned long findstage(char* target)
-{
-        unsigned long entry;
-        asm volatile (
-                "mov $1f, %%esp\n\t"
-                "jmp walkcbfs\n\t"
-                "1:\n\t" : "=a" (entry) : "S" (target) : "ebx", "ecx", "edi", "esp");
-        return entry;
-}
-
-static void call(unsigned long addr, unsigned long bist)
-{
-        asm volatile ("jmp *%0\n\t" : : "r" (addr), "a" (bist));
-}
+#include <bootblock_common.h>
 
 static void main(unsigned long bist)