[coreboot-gerrit] Patch set updated for coreboot: 2686f59 arm64: Add verstage support

[Aaron Durbin (adurbin@google.com)]

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

-gerrit

commit 2686f59137241e758e232ca39ae2646ab0770a49
Author: Furquan Shaikh <furquan at google.com>
Date:   Thu Oct 2 16:43:19 2014 -0700

    arm64: Add verstage support
    
    This stage is not tested on any hardware.
    
    BUG=None
    BRANCH=None
    TEST=Compiles successfully for rush_ryu and veyron_pinky
    
    Original-Change-Id: I6dd266471c815895bb3dd53d34aacc8fe825eeb6
    Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/221911
    Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Furquan Shaikh <furquan at chromium.org>
    
    (cherry picked from commit 907ea2d1f8c9f01d815e8673695dd5271322c7a8)
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    
    Change-Id: I617a742d4a387be947086dae33e9a913f742a8d1
---
 src/arch/arm64/Makefile.inc           | 20 ++++++++++++++++++++
 src/arch/arm64/armv8/Makefile.inc     | 14 ++++++++++++++
 src/arch/arm64/armv8/lib/Makefile.inc |  4 ++++
 3 files changed, 38 insertions(+)

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 6d23dab..768dd73 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -75,6 +75,26 @@ $(objcbfs)/bootblock.debug: $(src)/arch/arm64/bootblock.ld $(obj)/ldoptions $$(b
 
 endif # CONFIG_ARCH_BOOTBLOCK_ARM64
 
+###############################################################################
+# verification stage
+###############################################################################
+
+ifeq ($(CONFIG_ARCH_VERSTAGE_ARM64),y)
+
+$(objcbfs)/verstage.debug: $$(verstage-objs) $$(VB2_LIB)
+	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
+	$(call link,verstage,$(filter %.a %.o,$(^)),-o $(@) -L$(obj) -T $(obj)/mainboard/$(MAINBOARDDIR)/memlayout.verstage.ld,--gc-sections)
+
+verstage-$(CONFIG_EARLY_CONSOLE) += early_console.c
+verstage-y += div0.c
+verstage-y += eabi_compat.c
+verstage-y += ../../lib/memset.c
+verstage-y += ../../lib/memcpy.c
+verstage-y += ../../lib/memmove.c
+verstage-y += stages.c
+
+endif # CONFIG_ARCH_VERSTAGE_ARM64
+
 ################################################################################
 # romstage
 ################################################################################
diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc
index ae9f38d..f0c5bbb 100644
--- a/src/arch/arm64/armv8/Makefile.inc
+++ b/src/arch/arm64/armv8/Makefile.inc
@@ -46,6 +46,20 @@ bootblock-S-ccopts += $(armv8_asm_flags)
 endif
 
 ################################################################################
+## verstage
+################################################################################
+ifeq ($(CONFIG_ARCH_VERSTAGE_ARM_V8_64),y)
+
+verstage-y += cache.c
+verstage-y += cpu.S
+verstage-y += exception.c
+
+verstage-c-ccopts += $(armv8_flags)
+verstage-S-ccopts += $(armv8_asm_flags)
+
+endif
+
+################################################################################
 ## romstage
 ################################################################################
 ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV8_64),y)
diff --git a/src/arch/arm64/armv8/lib/Makefile.inc b/src/arch/arm64/armv8/lib/Makefile.inc
index 0622593..7e647bd 100644
--- a/src/arch/arm64/armv8/lib/Makefile.inc
+++ b/src/arch/arm64/armv8/lib/Makefile.inc
@@ -26,6 +26,10 @@ ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV8_64),y)
 bootblock-y += $(lib_access)
 endif
 
+ifeq ($(CONFIG_ARCH_VERSTAGE_ARMV8_64),y)
+verstage-y += $(lib_access)
+endif
+
 ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV8_64),y)
 romstage-y += $(lib_access)
 endif