Changeset 5151


Ignore:
Timestamp:
Feb 23, 2010 8:38:44 PM (3 years ago)
Author:
oxygene
Message:
  • Remove src/arch/i386/init/ldscript_cbfs.lb as it's not used anymore
  • Remove _lrom and _elrom, as they're only set but never used
  • Make bootblock size dynamic in the tiny bootblock case. It's 0.5-3K instead of 64K now.

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Peter Stuge <peter@…>

Location:
trunk/src/arch/i386/init
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/arch/i386/init/ldscript_failover.lb

    r5132 r5151  
    2828OUTPUT_ARCH(i386) 
    2929 
    30 /* 
    31 ENTRY(_start) 
    32 */ 
     30MEMORY { 
     31        rom : ORIGIN = 0xffff0000, LENGTH = 64K 
     32} 
    3333 
    3434TARGET(binary) 
    3535SECTIONS 
    3636{ 
    37         . = CONFIG_ROMBASE; 
     37        . = 0; 
    3838 
    3939        /* This section might be better named .setup */ 
    40         .rom . : { 
     40        .rom ROMLOC : { 
    4141                _rom = .; 
    4242                *(.rom.text); 
    … …  
    4444                *(.rom.data.*); 
    4545                *(.rodata.*); 
    46                 . = ALIGN(16); 
    4746                _erom = .; 
    48         } 
     47        } >rom =0xff 
    4948 
    50         _lrom = LOADADDR(.rom); 
    51         _elrom = LOADADDR(.rom) + SIZEOF(.rom); 
     49        ROMLOC = 0xffffff00 - (_erom - _rom) + 1; 
    5250 
    5351        /DISCARD/ : { 
    … …  
    5654                *(.comment.*) 
    5755                *(.note.*) 
     56                *(.iplt) 
     57                *(.rel.*) 
     58                *(.igot.*) 
    5859        } 
    5960} 

  • trunk/src/arch/i386/init/ldscript_fallback_cbfs.lb

    r5132 r5151  
    5454        } 
    5555 
    56         _lrom = LOADADDR(.rom); 
    57         _elrom = LOADADDR(.rom) + SIZEOF(.rom); 
    58  
    5956        /DISCARD/ : { 
    6057                *(.comment) 
Note: See TracChangeset for help on using the changeset viewer.