Skip to content

Commit

Permalink
[mromprefix] Allow for .mrom images larger than 128kB
Browse files Browse the repository at this point in the history
The .mrom payload has a code type of 0xff and so the initialisation
length field (single byte at offset 0x02) does not need to be
present.  Use only the PCI header's image length field, which allows
the .mrom payload to be up to 32MB in size.

Inspired-by: Swift Geek <swiftgeek@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Aug 26, 2014
1 parent 3937274 commit 8049a52
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/arch/i386/prefix/mromprefix.S
Expand Up @@ -196,7 +196,7 @@ find_mem_bar:
movl %eax, %esi
addr32 es movzbl 2(%esi), %ecx
shll $7, %ecx
addr32 es movzbl 2(%esi,%ecx,4), %edx
addr32 es movzwl mpciheader_image_length(%esi,%ecx,4), %edx
shll $7, %edx
addl %edx, %ecx
addr32 es rep movsl
Expand Down Expand Up @@ -463,20 +463,12 @@ pci_set_mem_access:
.org 0x00
mromheader:
.word 0xaa55 /* BIOS extension signature */
mromheader_size: .byte 0 /* Size in 512-byte blocks */
.org 0x18
.word mpciheader
.org 0x1a
.word 0
.size mromheader, . - mromheader

.section ".zinfo.fixup", "a", @progbits /* Compressor fixups */
.ascii "APPB"
.long mromheader_size
.long 512
.long 0
.previous

mpciheader:
.ascii "PCIR" /* Signature */
.word pci_vendor_id /* Vendor identification */
Expand Down

0 comments on commit 8049a52

Please sign in to comment.