aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-03-08 07:50:43 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2011-03-08 07:50:43 +0000
commitfab35e3f73ba149eb109c24a8f906347b877d2ea (patch)
tree82ac7ab90045bc1edc8c8ee477b5bcd54c37ef7a /src/arch/x86/init
parent85e666dc37183c491227b794debb24e03a909ac1 (diff)
downloadcoreboot-fab35e3f73ba149eb109c24a8f906347b877d2ea.tar.gz
coreboot-fab35e3f73ba149eb109c24a8f906347b877d2ea.tar.xz
coreboot-fab35e3f73ba149eb109c24a8f906347b877d2ea.zip
Move cmos.default handling to bootblock
The cmos.default code wasn't actually used so far, due to an oversight when forward-porting this feature from an old branch. - Extend walkcbfs' use by factoring out the stage handling into C code. - New sanitize_cmos() function that looks if CMOS data is invalid and cmos.default exists and if so overwrites CMOS with cmos.default data. - Use sanitize_cmos() in both bootblock implementations. - Drop the need to reboot after writing CMOS: CMOS wasn't used so far, so we can go on without a reboot. - Remove the restriction that cmos.default only works on CAR boards. - Always build in cmos.default support on boards that USE_OPTION_TABLE. Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6436 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock_normal.c4
-rw-r--r--src/arch/x86/init/bootblock_simple.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 08651c32b..99551484a 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -8,6 +8,10 @@ static void main(unsigned long bist)
bootblock_southbridge_init();
}
+#if CONFIG_USE_OPTION_TABLE
+ sanitize_cmos();
+#endif
+
unsigned long entry;
if (do_normal_boot())
entry = findstage("normal/romstage");
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c
index e8994ee09..3887b97c5 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -6,6 +6,11 @@ static void main(unsigned long bist)
bootblock_northbridge_init();
bootblock_southbridge_init();
}
+
+#if CONFIG_USE_OPTION_TABLE
+ sanitize_cmos();
+#endif
+
const char* target1 = "fallback/romstage";
unsigned long entry;
entry = findstage(target1);