Refactor copy_and_run so that it uses a single code base instead of

[coreboot.git] / src / arch / i386 / init / ldscript.lb

diff --git a/src/arch/i386/init/ldscript.lb b/src/arch/i386/init/ldscript.lb
index e647fb42fe53b2b5f475bfc2fa136334e6286abd..50a8c9965db263fd098a074af5456cd6e1737ba8 100644 (file)
--- a/src/arch/i386/init/ldscript.lb
+++ b/src/arch/i386/init/ldscript.lb
@@ -7,7 +7,7 @@
  *                             : heap
  *                             : stack
  *     _ROMBASE
- *                             : linuxbios text 
+ *                             : coreboot text 
  *                             : readonly text
  */
 /*
@@ -32,25 +32,23 @@ ENTRY(_start)
 */
 
 TARGET(binary)
-INPUT(linuxbios_ram.rom)
+INPUT(coreboot_ram.rom)
 SECTIONS
 {
        . = _ROMBASE;
-       
+
        .ram . : {
                _ram = . ;
-               linuxbios_ram.rom(*)
+               coreboot_ram.rom(*)
                _eram = . ;
        }
 
-       _x = .;
-       . = (_x < (_ROMBASE - 0x10000 +  ROM_IMAGE_SIZE)) ? (_ROMBASE - 0x10000 +  ROM_IMAGE_SIZE) : _x;
-
        /* This section might be better named .setup */
        .rom . : {
                _rom = .;
                *(.rom.text);
                *(.rom.data);
+               *(.rodata.*);
                *(.rom.data.*);
                . = ALIGN(16);
                _erom = .;
@@ -65,6 +63,8 @@ SECTIONS
 
        /DISCARD/ : {
                *(.comment)
+               *(.comment.*)
                *(.note)
+               *(.note.*)
        }
 }