[coreboot-gerrit] New patch to review for coreboot: adf3c0d relocatable ramstage: fix linking

Aaron Durbin (adurbin@google.com) gerrit at coreboot.org
Sat Mar 23 02:27:49 CET 2013


Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2884

-gerrit

commit adf3c0d15f1aabbc7b84858dd013c2055077bb89
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri Mar 22 19:59:52 2013 -0500

    relocatable ramstage: fix linking
    
    The ramstage is now linked using an intermediate object that
    is created from the complete list of ramstage object files.
    The rmodule code was developed when ramstage was linked using
    an archive file. Because of the fact that the rmodule headers
    are not referenced from any other object the link could start
    by specifying the rmodule header object for ramstage. That,
    however, is not the case as all ramstage objects are included
    in the intermediate linked object. Therefore, the
    ramstage_module_header.ramstage.o object file needs to be removed
    from the object list for the ramstage rmodule.
    
    Change-Id: I6a79b6f8dd1dbfe40fdc7753297243c3c9b45fae
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/arch/x86/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 377a863..bbf2336 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -162,7 +162,7 @@ $(objcbfs)/%.elf: $(objcbfs)/%.debug
 
 ifeq ($(CONFIG_RELOCATABLE_RAMSTAGE),y)
 
-$(eval $(call rmodule_link,$(objcbfs)/coreboot_ram.debug, $(obj)/arch/x86/boot/ramstage_module_header.ramstage.o $(objgenerated)/coreboot_ram.o, $(CONFIG_HEAP_SIZE)))
+$(eval $(call rmodule_link,$(objcbfs)/coreboot_ram.debug, $(objgenerated)/coreboot_ram.o, $(CONFIG_HEAP_SIZE)))
 
 else
 



More information about the coreboot-gerrit mailing list