diff options
| author | Michael Brown | 2007-07-16 18:03:19 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-16 18:03:19 +0200 |
| commit | 0929142a158324dc5ded0cc463a0a6ef3b6e5873 (patch) | |
| tree | dd90c049be50f58e274010693db613505f7c3694 | |
| parent | Compressed ROM images now work. (diff) | |
| download | ipxe-0929142a158324dc5ded0cc463a0a6ef3b6e5873.tar.gz ipxe-0929142a158324dc5ded0cc463a0a6ef3b6e5873.tar.xz ipxe-0929142a158324dc5ded0cc463a0a6ef3b6e5873.zip | |
Rename _rom_size to _load_size_sect, since hdprefix.S also uses it.
| -rw-r--r-- | src/arch/i386/prefix/hdprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/romprefix.S | 4 | ||||
| -rw-r--r-- | src/arch/i386/scripts/i386-kir.lds | 2 | ||||
| -rw-r--r-- | src/arch/i386/scripts/i386.lds | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S index ceab2061..99bb541b 100644 --- a/src/arch/i386/prefix/hdprefix.S +++ b/src/arch/i386/prefix/hdprefix.S @@ -59,7 +59,7 @@ load_image: ljmp $BOOT_SEG, $start_image load_length: - .long _rom_size + .long _load_size_sect max_sector: .byte 0 max_head: diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S index 3e6cd2d0..68123f0f 100644 --- a/src/arch/i386/prefix/romprefix.S +++ b/src/arch/i386/prefix/romprefix.S @@ -14,7 +14,7 @@ .org 0x00 romheader: .word 0xAA55 /* BIOS extension signature */ -romheader_size: .byte _rom_size /* Size in 512-byte blocks */ +romheader_size: .byte _load_size_sect /* Size in 512-byte blocks */ jmp init_vector /* Initialisation vector */ .org 0x16 .word undiheader @@ -34,7 +34,7 @@ pciheader: .byte 0x02 /* Device Base Type code */ .byte 0x00 /* Device Sub-Type code */ .byte 0x00 /* Device Interface Type code */ -pciheader_size: .word _rom_size /* Image length same as offset 02h */ +pciheader_size: .word _load_size_sect /* Image length same as offset 02h */ .word 0x0001 /* revision level of code/data */ .byte 0x00 /* code type */ .byte 0x80 /* Flags (last PCI data structure) */ diff --git a/src/arch/i386/scripts/i386-kir.lds b/src/arch/i386/scripts/i386-kir.lds index 401298c9..b213c605 100644 --- a/src/arch/i386/scripts/i386-kir.lds +++ b/src/arch/i386/scripts/i386-kir.lds @@ -192,5 +192,5 @@ SECTIONS { _text16_size_pgh = ( ( _text16_size + 15 ) / 16 ); _data16_size_pgh = ( ( _data16_size + 15 ) / 16 ); _load_size_pgh = ( ( _load_size + 15 ) / 16 ); - _rom_size = ( ( _load_size + 511 ) / 512 ); + _load_size_sect = ( ( _load_size + 511 ) / 512 ); } diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds index 8ff7c45a..511353ce 100644 --- a/src/arch/i386/scripts/i386.lds +++ b/src/arch/i386/scripts/i386.lds @@ -270,5 +270,5 @@ SECTIONS { _text16_size_pgh = ( ( _text16_size + 15 ) / 16 ); _data16_size_pgh = ( ( _data16_size + 15 ) / 16 ); _load_size_pgh = ( ( _load_size + 15 ) / 16 ); - _rom_size = ( ( _load_size + 511 ) / 512 ); + _load_size_sect = ( ( _load_size + 511 ) / 512 ); } |