These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / arch / i386 / prefix / usbdisk.S

diff --git a/qemu/roms/ipxe/src/arch/i386/prefix/usbdisk.S b/qemu/roms/ipxe/src/arch/i386/prefix/usbdisk.S
index fa7d195..9676406 100644 (file)
--- a/qemu/roms/ipxe/src/arch/i386/prefix/usbdisk.S
+++ b/qemu/roms/ipxe/src/arch/i386/prefix/usbdisk.S
@@ -1,3 +1,5 @@
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
+
        .text
        .arch i386
        .section ".prefix", "awx", @progbits
@@ -6,18 +8,27 @@
 
 #include "mbr.S"
 
-/* Partition table: ZIP-compatible partition 4, 64 heads, 32 sectors/track */
+/* Partition table: 64 heads, 32 sectors/track (ZIP-drive compatible) */
        .org 446
        .space 16
        .space 16
-       .space 16
-       .byte 0x80, 0x01, 0x01, 0x00
-       .byte 0xeb, 0x3f, 0x20, 0x01
+       /* Partition 3: log partition (for CONSOLE_INT13) */
+       .byte 0x00, 0x01, 0x01, 0x00
+       .byte 0xe0, 0x3f, 0x20, 0x00
        .long 0x00000020
-       .long 0x00000fe0
+       .long 0x000007e0
+       /* Partition 4: boot partition */
+       .byte 0x80, 0x00, 0x01, 0x01
+       .byte 0xeb, 0x3f, 0x20, 0x02
+       .long 0x00000800
+       .long 0x00001000
 
        .org 510
        .byte 0x55, 0xaa
 
-/* Skip to start of partition */
+/* Skip to start of log partition */
        .org 32 * 512
+       .ascii "iPXE LOG\n\n"
+
+/* Skip to start of boot partition */
+       .org 2048 * 512