This patch unifies the use of config options in v2 to all start with CONFIG_

[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 1af399cf81da16118c1bd0972392067410dd899e..0ed5c47f53d03be9a233039347aa90a7fc805c28 100644 (file)
--- a/src/arch/i386/init/ldscript.lb
+++ b/src/arch/i386/init/ldscript.lb
@@ -1,13 +1,13 @@
 /*
  *     Memory map:
  *
- *     _RAMBASE                
+ *     CONFIG_RAMBASE          
  *                             : data segment
  *                             : bss segment
  *                             : heap
  *                             : stack
- *     _ROMBASE
- *                             : linuxbios text 
+ *     CONFIG_ROMBASE
+ *                             : coreboot text 
  *                             : readonly text
  */
 /*
@@ -27,36 +27,44 @@
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
 
+/*
 ENTRY(_start)
+*/
 
 TARGET(binary)
-INPUT(linuxbios_payload)
+INPUT(coreboot_ram.rom)
 SECTIONS
 {
-       . = _ROMBASE;
+       . = CONFIG_ROMBASE;
+
+       .ram . : {
+               _ram = . ;
+               coreboot_ram.rom(*)
+               _eram = . ;
+       }
+
        /* This section might be better named .setup */
        .rom . : {
                _rom = .;
                *(.rom.text);
                *(.rom.data);
+               *(.rodata.*);
+               *(.rom.data.*);
                . = ALIGN(16);
                _erom = .;
        }
+
        _lrom = LOADADDR(.rom);
        _elrom = LOADADDR(.rom) + SIZEOF(.rom);
-       
-       .payload . : {
-               _payload = . ;
-               linuxbios_payload(*)
-               _epayload = . ;
-       }
-       _iseg = _RAMBASE;
-       _eiseg = _iseg + SIZEOF(.payload);
-       _liseg = _payload;
-       _eliseg = _epayload;
+       _iseg = CONFIG_RAMBASE;
+       _eiseg = _iseg + SIZEOF(.ram);
+       _liseg = _ram;
+       _eliseg = _eram;
 
        /DISCARD/ : {
                *(.comment)
+               *(.comment.*)
                *(.note)
+               *(.note.*)
        }
 }