Makefile: rename linker intermediate variable

[coreboot.git] / src / arch / x86 / init / bootblock.ld

diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index dae17bd6bd38de28ed788fe69086e88feb50d0a4..27d718fcbc8e71ec5c53f53c81a0683a9ba2e010 100644 (file)
--- a/src/arch/x86/init/bootblock.ld
+++ b/src/arch/x86/init/bootblock.ld
@@ -25,13 +25,8 @@ OUTPUT_ARCH(i386)
 TARGET(binary)
 SECTIONS
 {
-       . = CONFIG_ROMBASE;
+       . = ROMSTAGE_BASE;
 
-       /* cut _start into last 64k */
-       _x = .;
-       . = (_x < CONFIG_ROMBASE) ? (CONFIG_ROMBASE) : _x;
-
-       /* This section might be better named .setup */
        .rom . : {
                _rom = .;
                *(.rom.text);
@@ -39,7 +34,6 @@ SECTIONS
                *(.rodata);
                *(.rodata.*);
                *(.rom.data.*);
-               *(.eh_frame);
                . = ALIGN(16);
                _erom = .;
        }
@@ -49,7 +43,8 @@ SECTIONS
                *(.note)
                *(.comment.*)
                *(.note.*)
+               *(.eh_frame);
        }
 
-       _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_AMD_AGESA, "Do not use global variables in romstage");
+       _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_CPU_AMD_AGESA, "Do not use global variables in romstage");
 }