narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misread the definition of the type_of_loader field; it should include a 

version.
pull/1/head
Michael Brown 2007-01-19 15:40:01 +00:00
parent 92a78c8e15
commit ebb00e032c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/image/bzimage.c
View File

@ -430,7 +430,7 @@ static int bzimage_write_header ( struct image *image __unused,
struct bzimage_cmdline cmdline; struct bzimage_cmdline cmdline;
/* Update the header and copy it into the loaded kernel */ /* 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 ) { if ( bzhdr->version >= 0x0201 ) {
bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 ); bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 );
bzhdr->loadflags |= BZI_CAN_USE_HEAP; bzhdr->loadflags |= BZI_CAN_USE_HEAP;

8
src/arch/i386/include/bzimage.h
View File

@ -71,7 +71,13 @@ struct bzimage_header {
#define BZI_SIGNATURE 0x53726448 #define BZI_SIGNATURE 0x53726448
/** bzImage boot loader identifier for Etherboot */ /** 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 */ /** bzImage "load high" flag */
#define BZI_LOAD_HIGH 0x01 #define BZI_LOAD_HIGH 0x01