Browse Source

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

version.
tags/v0.9.3
Michael Brown 18 years ago
parent
commit
ebb00e032c
2 changed files with 8 additions and 2 deletions
  1. 1
    1
      src/arch/i386/image/bzimage.c
  2. 7
    1
      src/arch/i386/include/bzimage.h

+ 1
- 1
src/arch/i386/image/bzimage.c View File

430
 	struct bzimage_cmdline cmdline;
430
 	struct bzimage_cmdline cmdline;
431
 
431
 
432
 	/* Update the header and copy it into the loaded kernel */
432
 	/* Update the header and copy it into the loaded kernel */
433
-	bzhdr->type_of_loader = BZI_LOADER_TYPE_ETHERBOOT;
433
+	bzhdr->type_of_loader = BZI_LOADER_TYPE_GPXE;
434
 	if ( bzhdr->version >= 0x0201 ) {
434
 	if ( bzhdr->version >= 0x0201 ) {
435
 		bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 );
435
 		bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 );
436
 		bzhdr->loadflags |= BZI_CAN_USE_HEAP;
436
 		bzhdr->loadflags |= BZI_CAN_USE_HEAP;

+ 7
- 1
src/arch/i386/include/bzimage.h View File

71
 #define BZI_SIGNATURE 0x53726448
71
 #define BZI_SIGNATURE 0x53726448
72
 
72
 
73
 /** bzImage boot loader identifier for Etherboot */
73
 /** bzImage boot loader identifier for Etherboot */
74
-#define BZI_LOADER_TYPE_ETHERBOOT 4
74
+#define BZI_LOADER_TYPE_ETHERBOOT 0x40
75
+
76
+/** bzImage boot loader identifier for gPXE
77
+ *
78
+ * We advertise ourselves as Etherboot version 6.
79
+ */
80
+#define BZI_LOADER_TYPE_GPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
75
 
81
 
76
 /** bzImage "load high" flag */
82
 /** bzImage "load high" flag */
77
 #define BZI_LOAD_HIGH 0x01
83
 #define BZI_LOAD_HIGH 0x01

Loading…
Cancel
Save