summaryrefslogtreecommitdiff
path: root/src/pc80
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/pc80
parent85e666dc37183c491227b794debb24e03a909ac1 (diff)
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/pc80')
-rw-r--r--src/pc80/mc146818rtc_early.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/pc80/mc146818rtc_early.c b/src/pc80/mc146818rtc_early.c
index 920dedace2..d09d6b9df0 100644
--- a/src/pc80/mc146818rtc_early.c
+++ b/src/pc80/mc146818rtc_early.c
@@ -11,15 +11,6 @@
#error "CONFIG_MAX_REBOOT_CNT too high"
#endif
-#if CONFIG_USE_CMOS_RECOVERY
-#include <cbfs.h>
-#include <console/loglevel.h>
-
-int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
-#define printk_warning(fmt, arg...) do_printk(BIOS_WARNING ,fmt, ##arg)
-#define printk_debug(fmt, arg...) do_printk(BIOS_DEBUG ,fmt, ##arg)
-#endif
-
static int cmos_error(void)
{
unsigned char reg_d;
@@ -63,25 +54,6 @@ static inline int do_normal_boot(void)
unsigned char byte;
if (cmos_error() || !cmos_chksum_valid()) {
-#if CONFIG_USE_CMOS_RECOVERY
- char *cmos_default = cbfs_find_file("cmos.default", CBFS_COMPONENT_CMOS_DEFAULT);
- if (cmos_default) {
- int i;
- printk_warning("WARNING - CMOS CORRUPTED. RESTORING DEFAULTS.\n");
- /* First 14 bytes are reserved for
- RTC and ignored by nvramtool, too.
- Only 128 bytes: 128+ requires cmos configuration and
- contains only suspend-to-ram data, which isn't part
- of the recovery procedure. */
- for (i = 14; i < 128; i++) {
- cmos_write(cmos_default[i], i);
- }
- /* Now reboot to run with default cmos. */
- outb(0x06, 0xcf9);
- for (;;) asm("hlt"); /* Wait for reset! */
- }
-#endif
-
/* There are no impossible values, no checksums so just
* trust whatever value we have in the the cmos,
* but clear the fallback bit.