diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-07 22:41:29 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-07 22:41:29 -0700 |
| commit | c14f98ab23dbc912aa9db26d86434a4d2bd80a5f (patch) | |
| tree | a0b1d6fd48ad30f8af19a88d11a8f4e61cebf52f /gpxe/src/arch/i386/prefix/lkrnprefix.S | |
| parent | 3506d7fb195922b04c941650b1512440bdcc89e4 (diff) | |
| download | syslinux-c14f98ab23dbc912aa9db26d86434a4d2bd80a5f.tar.gz | |
gPXE: update gPXE to current git
Update gPXE to current git.
gpxe-for-syslinux e3ef2094cfa26f874c5f8dbd687eb311830efcf0
gpxe main tree 8223084afc206000312611a3fcfa30a28500d1a3
Diffstat (limited to 'gpxe/src/arch/i386/prefix/lkrnprefix.S')
| -rw-r--r-- | gpxe/src/arch/i386/prefix/lkrnprefix.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gpxe/src/arch/i386/prefix/lkrnprefix.S b/gpxe/src/arch/i386/prefix/lkrnprefix.S index 59e70cd1..c1e92f57 100644 --- a/gpxe/src/arch/i386/prefix/lkrnprefix.S +++ b/gpxe/src/arch/i386/prefix/lkrnprefix.S @@ -110,7 +110,10 @@ root_dev: boot_flag: .word 0xAA55 jump: - jmp setup_code + /* Manually specify a two-byte jmp instruction here rather + * than leaving it up to the assembler. */ + .byte 0xeb + .byte setup_code - header header: .byte 'H', 'd', 'r', 'S' version: @@ -142,7 +145,10 @@ pad1: cmd_line_ptr: .long 0 initrd_addr_max: - .long 0 + /* We don't use an initrd but some bootloaders (e.g. SYSLINUX) have + * been known to require this field. Set the value to 2 GB. This + * value is also used by the Linux kernel. */ + .long 0x7fffffff kernel_alignment: .long 0 relocatable_kernel: |