[coreboot-gerrit] New patch to review for coreboot: 02e00b6 arm: update verstage linking

Aaron Durbin (adurbin@chromium.org) gerrit at coreboot.org
Fri May 8 23:08:08 CEST 2015


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

-gerrit

commit 02e00b65c2042cdb2f9fd63d9329e4a031331e36
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri May 8 15:52:52 2015 -0500

    arm: update verstage linking
    
    The linker scripts are added to stage objs so remove those
    from the object lists. boot.c will be needed to link verstage
    properly.
    
    Change-Id: Ib8427fe015b72e2282219f116a39949739a0af48
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/arch/arm64/Makefile.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 3791ae7..8787d42 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -84,11 +84,12 @@ endif # CONFIG_ARCH_BOOTBLOCK_ARM64
 
 ifeq ($(CONFIG_ARCH_VERSTAGE_ARM64),y)
 
-$(objcbfs)/verstage.debug: $(objgenerated)/libverstage.a $$(verstage-objs) $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.verstage.ld $(obj)/config.h
+$(objcbfs)/verstage.debug: $(objgenerated)/libverstage.a $$(verstage-objs)
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
-	$(LD_verstage) --gc-sections -static -o $@ -L$(obj) --start-group $(objgenerated)/libverstage.a $$(verstage-objs)--end-group -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.verstage.ld
+	$(LD_verstage) --gc-sections -static -o $@ -L$(obj) --start-group $(objgenerated)/libverstage.a $$(verstage-objs) --end-group -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.verstage.ld
 
 verstage-$(CONFIG_EARLY_CONSOLE) += early_console.c
+verstage-y += boot.c
 verstage-y += div0.c
 verstage-y += eabi_compat.c
 verstage-y += ../../lib/memset.c



More information about the coreboot-gerrit mailing list