From 5780d6f3876723b94fbe3653c9d87dad6330862e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 14 Jan 2015 16:53:05 +0100 Subject: Revert "vboot2: add verstage" This reverts commit 320647abdad1ea6cdceb834933507677020ea388, because it introduced the following regression. $ LANG=C make V=1 Warning: no suitable GCC for arm. Warning: no suitable GCC for aarch64. Warning: no suitable GCC for riscv. /bin/sh: --: invalid option Usage: /bin/sh [GNU long option] [option] ... /bin/sh [GNU long option] [option] script-file ... GNU long options: --debug --debugger --dump-po-strings --dump-strings --help --init-file --login --noediting --noprofile --norc --posix --rcfile --restricted --verbose --version Shell options: -ilrsD or -c command or -O shopt_option (invocation only) -abefhkmnptuvxBCHP or -o option make: -print-libgcc-file-name: Command not found It also introduced trailing whitespace. Change-Id: I50ec00a38e24c854fa926357cd24f9286bf4f66f Signed-off-by: Paul Menzel Reviewed-on: http://review.coreboot.org/8223 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc Reviewed-by: Edward O'Callaghan --- src/arch/arm/Kconfig | 4 ---- src/arch/arm/Makefile.inc | 2 +- src/arch/arm/armv7/Kconfig | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/arch') diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig index f73ad279f1..156c8c227e 100644 --- a/src/arch/arm/Kconfig +++ b/src/arch/arm/Kconfig @@ -3,10 +3,6 @@ config ARCH_BOOTBLOCK_ARM default n select ARCH_ARM -config ARCH_VERSTAGE_ARM - bool - default n - config ARCH_ROMSTAGE_ARM bool default n diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc index ba7fb60206..5698f38c9b 100644 --- a/src/arch/arm/Makefile.inc +++ b/src/arch/arm/Makefile.inc @@ -61,7 +61,7 @@ bootblock-y += memcpy.S bootblock-y += memmove.S bootblock-y += div0.c -$(objcbfs)/bootblock.debug: $(src)/arch/arm/bootblock.ld $(obj)/ldoptions $$(bootblock-objs) $$(VERSTAGE_LIB) +$(objcbfs)/bootblock.debug: $(src)/arch/arm/bootblock.ld $(obj)/ldoptions $$(bootblock-objs) @printf " LINK $(subst $(obj)/,,$(@))\n" $(LD_bootblock) --gc-sections -static -o $@ -L$(obj) --start-group $(bootblock-objs) --end-group -T $(src)/arch/arm/bootblock.ld diff --git a/src/arch/arm/armv7/Kconfig b/src/arch/arm/armv7/Kconfig index aa188e2764..f8e0205c40 100644 --- a/src/arch/arm/armv7/Kconfig +++ b/src/arch/arm/armv7/Kconfig @@ -2,10 +2,6 @@ config ARCH_BOOTBLOCK_ARMV7 def_bool n select ARCH_BOOTBLOCK_ARM -config ARCH_VERSTAGE_ARMV7 - def_bool n - select ARCH_VERSTAGE_ARM - config ARCH_ROMSTAGE_ARMV7 def_bool n select ARCH_ROMSTAGE_ARM -- cgit v1.2.3