Makefile: rename linker intermediate variable

Renamed CONFIG_ROMBASE to ROMSTAGE_BASE and removed it from Kconfig.
Removed no-op calculation in ldscript.

Change-Id: I53d39b60f07db76c8537b3133e59360687b9d4a7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/802
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Rudolf Marek <r.marek@assembler.cz>

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index c5a0c0e2f5b1a24562c23528e12a942877c4cf9c..314646fdb975e71b1527f47b9c08f5d0b0dea589 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -8,10 +8,6 @@ config AP_IN_SIPI_WAIT
        default n
        depends on ARCH_X86
 
-config ROMBASE
-       hex
-       default 0xffff0000
-
 config RAMBASE
        hex
        default 0x100000

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index d3dac118ecdd076abb79c966299fb894e02748bb..fc3cd14fbad580dd5ae787d105d8e230c27c7eb9 100755 (executable)
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -342,10 +342,10 @@ $(obj)/bootblock.elf: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o $(obj)/bootbl
 # Build the romstage
 $(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(romstage-objs) $(obj)/romstage/ldscript.ld
        @printf "    LINK       $(subst $(obj)/,,$(@))\n"
-       printf "CONFIG_ROMBASE = 0x0;\n" > $(obj)/location.ld
+       printf "ROMSTAGE_BASE = 0x0;\n" > $(obj)/location.ld
        $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs)
        $(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin
-       printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld
+       printf "ROMSTAGE_BASE = 0x" > $(obj)/location.ld
        $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt || { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; }
        cat $(obj)/location.txt >> $(obj)/location.ld
        printf ';\n' >> $(obj)/location.ld

diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index fd4d3db960381b84ad2602eaa591db65a59637ae..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);