From ebb00e032c5e707b031776510f355651d935c997 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 19 Jan 2007 15:40:01 +0000 Subject: [PATCH] Misread the definition of the type_of_loader field; it should include a version. --- src/arch/i386/image/bzimage.c | 2 +- src/arch/i386/include/bzimage.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c index bc947769..5ca3aafd 100644 --- a/src/arch/i386/image/bzimage.c +++ b/src/arch/i386/image/bzimage.c @@ -430,7 +430,7 @@ static int bzimage_write_header ( struct image *image __unused, struct bzimage_cmdline cmdline; /* Update the header and copy it into the loaded kernel */ - bzhdr->type_of_loader = BZI_LOADER_TYPE_ETHERBOOT; + bzhdr->type_of_loader = BZI_LOADER_TYPE_GPXE; if ( bzhdr->version >= 0x0201 ) { bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 ); bzhdr->loadflags |= BZI_CAN_USE_HEAP; diff --git a/src/arch/i386/include/bzimage.h b/src/arch/i386/include/bzimage.h index e536b6e8..f443fae7 100644 --- a/src/arch/i386/include/bzimage.h +++ b/src/arch/i386/include/bzimage.h @@ -71,7 +71,13 @@ struct bzimage_header { #define BZI_SIGNATURE 0x53726448 /** bzImage boot loader identifier for Etherboot */ -#define BZI_LOADER_TYPE_ETHERBOOT 4 +#define BZI_LOADER_TYPE_ETHERBOOT 0x40 + +/** bzImage boot loader identifier for gPXE + * + * We advertise ourselves as Etherboot version 6. + */ +#define BZI_LOADER_TYPE_GPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 ) /** bzImage "load high" flag */ #define BZI_LOAD_HIGH 0x01