瀏覽代碼

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

version.
tags/v0.9.3
Michael Brown 18 年之前
父節點
當前提交
ebb00e032c
共有 2 個文件被更改,包括 8 次插入2 次删除
  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 查看文件

@@ -430,7 +430,7 @@ static int bzimage_write_header ( struct image *image __unused,
430 430
 	struct bzimage_cmdline cmdline;
431 431
 
432 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 434
 	if ( bzhdr->version >= 0x0201 ) {
435 435
 		bzhdr->heap_end_ptr = ( load_ctx->rm_heap - 0x200 );
436 436
 		bzhdr->loadflags |= BZI_CAN_USE_HEAP;

+ 7
- 1
src/arch/i386/include/bzimage.h 查看文件

@@ -71,7 +71,13 @@ struct bzimage_header {
71 71
 #define BZI_SIGNATURE 0x53726448
72 72
 
73 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 82
 /** bzImage "load high" flag */
77 83
 #define BZI_LOAD_HIGH 0x01

Loading…
取消
儲存