This is a patch series to simplify the current boot prioritization
code. The basic idea is to replace the BCV list with a list that
contains all bootable objects. It's then easier to make that list
authoritative and do all ordering on it. This is a code
simplification even without the new "bootorder" file reading code.
-Kevin
Kevin O'Connor (2):
Populate drive_g->desc prior to calling add_bcv_internal().
Simplify boot ordering by building an inclusive boot list.
src/ahci.c | 11 +-
src/ata.c | 13 +-
src/block.c | 20 +---
src/boot.c | 425 ++++++++++++++++++++++--------------------------------
src/boot.h | 20 +--
src/coreboot.c | 20 +++
src/floppy.c | 5 +-
src/optionroms.c | 6 +-
src/usb-msc.c | 11 +-
src/virtio-blk.c | 10 +-
10 files changed, 226 insertions(+), 315 deletions(-)
--
1.7.3.4
I applied this change.
-Kevin
On Tue, Dec 21, 2010 at 10:29:27PM +0100, Stefan Reinauer wrote:
> Hi,
>
> I made these two tiny changes to SeaBIOS when I was playing with the
> HEAD version.
>
> The Makefile change prevents the test command from failing if CC
> contains a space.
>
> The coreboot change prevents a warning on our gcc 4.5.2 in certain
> circumstances when sizeof seems to be unsigned long int instead of
> unsigned int.
>
> They're both unintrusive, shouldn't have potential for breaking
> anything.
>
> Stefan
>
>
> Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org>
>
> --- Makefile 2010-12-21 13:21:07.179055000 -0800
> +++ Makefile 2010-12-21 13:21:52.129455000 -0800
> @@ -68,7 +68,7 @@
> ################ Build rules
>
> # Verify the gcc configuration and test if -fwhole-program works.
> -TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh)
> +TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh)
> ifeq "$(TESTGCC)" "-1"
> $(error "Please upgrade GCC")
> endif
> --- src/coreboot.c 2010-12-21 13:21:07.278052000 -0800
> +++ src/coreboot.c 2010-12-21 13:23:03.782793000 -0800
> @@ -320,7 +320,7 @@
> u8 scratch[15980];
> int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
> if (need > sizeof(scratch)) {
> - dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
> + dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
> return -1;
> }
> state.Probs = (CProb *)scratch;
>
>
>
I'm CC'ing the mailing list.
On Tue, Dec 21, 2010 at 10:29:27PM +0100, Stefan Reinauer wrote:
> Hi,
>
> I made these two tiny changes to SeaBIOS when I was playing with the
> HEAD version.
>
> The Makefile change prevents the test command from failing if CC
> contains a space.
>
> The coreboot change prevents a warning on our gcc 4.5.2 in certain
> circumstances when sizeof seems to be unsigned long int instead of
> unsigned int.
>
> They're both unintrusive, shouldn't have potential for breaking
> anything.
>
> Stefan
Thanks. Looks okay to me.
>
>
> Signed-off-by: Stefan Reinauer <stepan(a)coreboot.org>
>
> --- Makefile 2010-12-21 13:21:07.179055000 -0800
> +++ Makefile 2010-12-21 13:21:52.129455000 -0800
> @@ -68,7 +68,7 @@
> ################ Build rules
>
> # Verify the gcc configuration and test if -fwhole-program works.
> -TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh)
> +TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh)
> ifeq "$(TESTGCC)" "-1"
> $(error "Please upgrade GCC")
> endif
> --- src/coreboot.c 2010-12-21 13:21:07.278052000 -0800
> +++ src/coreboot.c 2010-12-21 13:23:03.782793000 -0800
> @@ -320,7 +320,7 @@
> u8 scratch[15980];
> int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
> if (need > sizeof(scratch)) {
> - dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
> + dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
> return -1;
> }
> state.Probs = (CProb *)scratch;
>
>
>