From 471515cebbe8890c3f82abaebc3a27bc133d5d0d Mon Sep 17 00:00:00 2001 From: Steven James Date: Wed, 8 Jan 2003 20:17:48 +0000 Subject: [PATCH] Updates to Clearwater and bootselect to support failover boot chooser --- src/mainboard/intel/Clearwater/Config | 2 +- util/baremetal/bootselect/chooser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mainboard/intel/Clearwater/Config b/src/mainboard/intel/Clearwater/Config index 97ad8f8155..e596ac320e 100644 --- a/src/mainboard/intel/Clearwater/Config +++ b/src/mainboard/intel/Clearwater/Config @@ -283,7 +283,7 @@ expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-65536))+(USE_NORMAL_IMAGE* ## The linuxBIOS bootloader. ## #expr ZKERNEL_START =(0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) -expr ZKERNEL_START = 0xfff00000 +expr ZKERNEL_START = 0xfff00000 + (USE_NORMAL_IMAGE * 0x10000) expr PAYLOAD_SIZE =ROM_SECTION_SIZE - ROM_IMAGE_SIZE diff --git a/util/baremetal/bootselect/chooser.c b/util/baremetal/bootselect/chooser.c index 0a6546eac2..b7f41d0b20 100644 --- a/util/baremetal/bootselect/chooser.c +++ b/util/baremetal/bootselect/chooser.c @@ -50,7 +50,7 @@ int choose_stream(struct stream *stream) current += current->block_count+1; } - j=1; + j=2; if(iskey()) { j = ttys0_rx_char(); j=-1;