Patch set updated for coreboot: x86: link ramstage the same way regardless of RELOCATABLE_RAMSTAGE

[Aaron Durbin]

Aaron Durbin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11524

-gerrit

commit 3b473d038d4e5dc1f92b725d712e717ce5f08136
Author: Aaron Durbin 
Date:   Sun Sep 6 10:45:18 2015 -0500

x86: link ramstage the same way regardless of RELOCATABLE_RAMSTAGE

Previously there were 2 paths in linking ramstage. One was used for
    RELOCATABLE_RAMSTAGE while the other was fixed location. Now that
    rmodtool can handle multiple secitons for a single proram segment
    there's no need for linking ramstage using lib/rmodule.ld.  That
    also means true rmodules don't have symbols required for ramstage
    purposes so fix memlayout.h. Lastly add default rules for creating
    rmod files from the known file names and locations.

BUG=chrome-os-partner:44827
    BRANCH=None
    TEST=Built rambi. Inspected ramstage.debug as well as rmodules
         created during the build.

Change-Id: I98d249036c27cb4847512ab8bca5ea7b02ce04bd
    Signed-off-by: Aaron Durbin 
---
 src/arch/x86/Makefile.inc | 10 +---------
 src/lib/Makefile.inc      |  9 ++++++---
 src/lib/program.ld        |  6 +++---
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index b018f7c..885bb7f 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -276,17 +276,11 @@ ramstage-libs ?=

ifeq ($(CONFIG_RELOCATABLE_RAMSTAGE),y)

-ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
-$(eval $(call rmodule_link,$(objcbfs)/ramstage.debug, $(objgenerated)/ramstage.o, $(CONFIG_HEAP_SIZE),x86_32))
-else
-$(eval $(call rmodule_link,$(objcbfs)/ramstage.debug, $(objgenerated)/ramstage.o, $(CONFIG_HEAP_SIZE),x86_64))
-endif
-
 # The rmodule_link defintion creates an elf file with .rmod extension.
 $(objcbfs)/ramstage.elf: $(objcbfs)/ramstage.debug.rmod
    cp $< $@

-else
+endif

ramstage-y += memlayout.ld

@@ -294,8 +288,6 @@ $(objcbfs)/ramstage.debug: $(objgenerated)/ramstage.o $(obj)/arch/x86/memlayout.
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(LD_ramstage) $(CPPFLAGS) $(LDFLAGS_ramstage) -o $@ -L$(obj) $< -T $(obj)/arch/x86/memlayout.ramstage.ld

-endif
-
 $(objgenerated)/ramstage.o: $$(ramstage-objs) $(COMPILER_RT_ramstage) $$(ramstage-libs)
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
 ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index a89f7d4..f4d8c2c 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -218,9 +218,12 @@ define rmodule_link
 $(strip $(1)): $(strip $(2)) $$(COMPILER_RT_rmodules_$(4)) $(obj)/lib/rmodule.rmodules_$(4).ld | $$(RMODTOOL)
    $$(LD_rmodules_$(4)) $$(LDFLAGS_rmodules_$(4)) $(RMODULE_LDFLAGS) -T $(obj)/lib/rmodule.rmodules_$(4).ld --defsym=__heap_size=$(strip $(3)) -o $$@ --whole-archive --start-group $(filter-out %.ld,$(2)) --end-group
    $$(NM_rmodules_$(4)) -n $$@ > $$(basename $$@).map
-
-$(strip $(1)).rmod: $(strip $(1))
-	$$(RMODTOOL) -i $$^ -o $$@
 endef

endif
+
+$(objcbfs)/%.debug.rmod: $(objcbfs)/%.debug | $(RMODTOOL)
+	$(RMODTOOL) -i $< -o $@
+
+$(obj)/%.elf.rmod: $(obj)/%.elf | $(RMODTOOL)
+	$(RMODTOOL) -i $< -o $@
diff --git a/src/lib/program.ld b/src/lib/program.ld
index e30a945..f776541 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -33,14 +33,14 @@
    *(.text);
    *(.text.*);

-#if ENV_RAMSTAGE || ENV_ROMSTAGE || ENV_RMODULE
+#if ENV_RAMSTAGE || ENV_ROMSTAGE
    ALIGN_COUNTER(ARCH_POINTER_ALIGN_SIZE)
    SYMBOL_CURRENT_LOC(cbmem_init_hooks)
    KEEP(*(.rodata.cbmem_init_hooks));
    SYMBOL_CURRENT_LOC(ecbmem_init_hooks)
 #endif

-#if ENV_RAMSTAGE || ENV_RMODULE
+#if ENV_RAMSTAGE
    ALIGN_COUNTER(ARCH_POINTER_ALIGN_SIZE)
    SYMBOL_CURRENT_LOC(pci_drivers)
    KEEP(*(.rodata.pci_driver));
@@ -87,7 +87,7 @@
 #ifdef __PRE_RAM__
    PROVIDE(_preram_cbmem_console = .);
    PROVIDE(_epreram_cbmem_console = _preram_cbmem_console);
-#elif ENV_RAMSTAGE || ENV_RMODULE
+#elif ENV_RAMSTAGE
    SYMBOL_CURRENT_LOC(bs_init_begin)
    KEEP(*(.bs_init));
    LONG(0);