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 99b0ce55bfee6ae8c6074b02b46c9dfbba1fcf95..0ed5c47f53d03be9a233039347aa90a7fc805c28 100644 (file)
--- a/src/arch/i386/init/ldscript.lb
+++ b/src/arch/i386/init/ldscript.lb
@@ -1,12 +1,12 @@
 /*
  *     Memory map:
  *
- *     _RAMBASE                
+ *     CONFIG_RAMBASE          
  *                             : data segment
  *                             : bss segment
  *                             : heap
  *                             : stack
- *     _ROMBASE
+ *     CONFIG_ROMBASE
  *                             : coreboot text 
  *                             : readonly text
  */
@@ -35,7 +35,7 @@ TARGET(binary)
 INPUT(coreboot_ram.rom)
 SECTIONS
 {
-       . = _ROMBASE;
+       . = CONFIG_ROMBASE;
 
        .ram . : {
                _ram = . ;
@@ -48,6 +48,7 @@ SECTIONS
                _rom = .;
                *(.rom.text);
                *(.rom.data);
+               *(.rodata.*);
                *(.rom.data.*);
                . = ALIGN(16);
                _erom = .;
@@ -55,7 +56,7 @@ SECTIONS
 
        _lrom = LOADADDR(.rom);
        _elrom = LOADADDR(.rom) + SIZEOF(.rom);
-       _iseg = _RAMBASE;
+       _iseg = CONFIG_RAMBASE;
        _eiseg = _iseg + SIZEOF(.ram);
        _liseg = _ram;
        _eliseg = _eram;