From 1182c46e39bb8f6bfc0c9e2914392ecc18a735b8 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@chromium.org>
Date: Tue, 7 Oct 2014 14:35:09 +0000
Subject: [PATCH] Revert "arm64: Add verstage support"

This reverts commit 36960019dcdab63fde8311a27eeaf5c6c14467f1.

Change-Id: Ie347622774bd9343face4890da2f65e8b29f4fb7
Reviewed-on: https://chromium-review.googlesource.com/221944
Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Tested-by: Michael Spang <spang@chromium.org>
---
 src/arch/arm64/Kconfig                |  4 ----
 src/arch/arm64/Makefile.inc           | 16 ----------------
 src/arch/arm64/armv8/Kconfig          |  3 ---
 src/arch/arm64/armv8/Makefile.inc     | 14 --------------
 src/arch/arm64/armv8/lib/Makefile.inc |  4 ----
 5 files changed, 41 deletions(-)

diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig
index efd596954d..6333e0c68b 100644
--- a/src/arch/arm64/Kconfig
+++ b/src/arch/arm64/Kconfig
@@ -3,10 +3,6 @@ config ARCH_BOOTBLOCK_ARM64
 	default n
 	select ARCH_ARM64
 
-config ARCH_VERSTAGE_ARM64
-	bool
-	default n
-
 config ARCH_ROMSTAGE_ARM64
 	bool
 	default n
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 5fab8bdb7f..dbe0c3ea25 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -65,22 +65,6 @@ $(objcbfs)/bootblock.debug: $$(bootblock-objs)
 
 endif # CONFIG_ARCH_BOOTBLOCK_ARM64
 
-###############################################################################
-# verification stage
-###############################################################################
-
-$(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
-
 ################################################################################
 # romstage
 ################################################################################
diff --git a/src/arch/arm64/armv8/Kconfig b/src/arch/arm64/armv8/Kconfig
index 5840e818ce..fc2e6680b1 100644
--- a/src/arch/arm64/armv8/Kconfig
+++ b/src/arch/arm64/armv8/Kconfig
@@ -1,9 +1,6 @@
 config ARCH_BOOTBLOCK_ARM_V8_64
 	def_bool n
 	select ARCH_BOOTBLOCK_ARM64
-config ARCH_VERSTAGE_ARM_V8_64
-	def_bool n
-	select ARCH_VERSTAGE_ARM64
 config ARCH_ROMSTAGE_ARM_V8_64
 	def_bool n
 	select ARCH_ROMSTAGE_ARM64
diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc
index a9adbeb825..007d46cabb 100644
--- a/src/arch/arm64/armv8/Makefile.inc
+++ b/src/arch/arm64/armv8/Makefile.inc
@@ -45,20 +45,6 @@ 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
 ################################################################################
diff --git a/src/arch/arm64/armv8/lib/Makefile.inc b/src/arch/arm64/armv8/lib/Makefile.inc
index 8a22391eb0..737debec84 100644
--- a/src/arch/arm64/armv8/lib/Makefile.inc
+++ b/src/arch/arm64/armv8/lib/Makefile.inc
@@ -34,10 +34,6 @@ ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARM_V8_64),y)
 bootblock-y += $(lib_access)
 endif
 
-ifeq ($(CONFIG_ARCH_VERSTAGE_ARM_V8_64),y)
-verstage-y += $(lib_access)
-endif
-
 ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM_V8_64),y)
 romstage-y += $(lib_access)
 endif