[bzImage] Support loading zImage kernels

zImage kernels require the real-mode portion to be loaded at 9000:0000 rather than 1000:0000.
ipxe · Jun 30, 2008 · ce51128 · ce51128
1 parent e9e1da1
commit ce51128
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c
@@ -414,7 +414,9 @@ static int bzimage_load_header ( struct image *image,
 	}
 
 	/* Calculate load address and size of real-mode portion */
-	load_ctx->rm_kernel_seg = 0x1000; /* place RM kernel at 1000:0000 */
+	load_ctx->rm_kernel_seg = ( ( bzhdr->loadflags & BZI_LOAD_HIGH ) ?
+				    0x1000 :  /* 1000:0000 (bzImage) */
+				    0x9000 ); /* 9000:0000 (zImage) */
 	load_ctx->rm_kernel = real_to_user ( load_ctx->rm_kernel_seg, 0 );
 	load_ctx->rm_filesz =
 		( ( bzhdr->setup_sects ? bzhdr->setup_sects : 4 ) + 1 ) << 9;