david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[prefix] Reasonable value for lkrn initrd_addr_max 

H. Peter Anvin <hpa@zytor.com> sent word that Sergey Vlasov
<vsu@altlinux.ru> discovered gPXE lkrn images fail to load in SYSLINUX
3.70 because we have initrd_addr_max zeroed.  This patch sets the same
value as the Linux kernel.

Also change the header jmp instruction to use a hardcoded opcode value
like Linux does.  Just in case the assembler decides to use a three-byte
instruction instead of the desired two-byte jmp.
This commit is contained in:
Stefan Hajnoczi 2008-07-30 19:45:48 +01:00
parent 594c672b75
commit 4cc786de81
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arch/i386/prefix/lkrnprefix.S
View File

@ -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: