Rename _rom_size to _load_size_sect, since hdprefix.S also uses it.

diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S
index ceab206..99bb541 100644 (file)
--- 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 3e6cd2d..68123f0 100644 (file)
--- 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 401298c..b213c60 100644 (file)
--- 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 8ff7c45..511353c 100644 (file)
--- 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 );
 }