diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | src/arch/arm/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/arm/armv7/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/bootblock.c | 9 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/verstage.c | 9 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra124/verstage.h | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/Kconfig | 8 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 9 |
10 files changed, 2 insertions, 48 deletions
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 diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig index ea946e6583..195261e2e4 100644 --- a/src/soc/nvidia/tegra124/Kconfig +++ b/src/soc/nvidia/tegra124/Kconfig @@ -2,7 +2,6 @@ config SOC_NVIDIA_TEGRA124 bool default n select ARCH_BOOTBLOCK_ARMV4 - select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 select HAVE_UART_SPECIAL diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index b306412956..792bb9992b 100644 --- a/src/soc/nvidia/tegra124/Makefile.inc +++ b/src/soc/nvidia/tegra124/Makefile.inc @@ -20,8 +20,6 @@ ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) bootblock-$(CONFIG_CONSOLE_SERIAL) += uart.c endif -verstage-y += verstage.c - romstage-y += cbfs.c romstage-y += cbmem.c romstage-y += clock.c diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c index 0456b488c9..2857a90ace 100644 --- a/src/soc/nvidia/tegra124/bootblock.c +++ b/src/soc/nvidia/tegra124/bootblock.c @@ -23,13 +23,10 @@ #include <console/console.h> #include <soc/clock.h> #include <soc/nvidia/tegra/apbmisc.h> + #include "pinmux.h" #include "power.h" -#if CONFIG_VBOOT2_VERIFY_FIRMWARE -#include "verstage.h" -#endif - void main(void) { void *entry; @@ -75,11 +72,7 @@ void main(void) power_enable_cpu_rail(); power_ungate_cpu(); -#if CONFIG_VBOOT2_VERIFY_FIRMWARE - entry = (void *)verstage_vboot_main; -#else entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/romstage"); -#endif if (entry) clock_cpu0_config_and_reset(entry); diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c deleted file mode 100644 index 234a89d0b2..0000000000 --- a/src/soc/nvidia/tegra124/verstage.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "verstage.h" - -/** - * Stage entry point - */ -void vboot_main(void) -{ - for(;;); -} diff --git a/src/soc/nvidia/tegra124/verstage.h b/src/soc/nvidia/tegra124/verstage.h deleted file mode 100644 index a0bac347c6..0000000000 --- a/src/soc/nvidia/tegra124/verstage.h +++ /dev/null @@ -1,2 +0,0 @@ -void vboot_main(void); -void verstage_vboot_main(void); diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 62d991b64d..81567582c1 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -85,14 +85,6 @@ config VBOOT_VERIFY_FIRMWARE Enabling VBOOT_VERIFY_FIRMWARE will use vboot to verify the ramstage and boot loader. -config VBOOT2_VERIFY_FIRMWARE - bool "Firmware Verification with vboot2" - default n - depends on CHROMEOS - help - Enabling VBOOT2_VERIFY_FIRMWARE will use vboot2 to verify the romstage - and boot loader. - config EC_SOFTWARE_SYNC bool "Enable EC software sync" default n diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 12d35b64c8..e17f50cd26 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -93,12 +93,3 @@ $(VB_LIB): fwlib endif - -ifeq ($(CONFIG_VBOOT2_VERIFY_FIRMWARE),y) -VERSTAGE_LIB = $(obj)/vendorcode/google/chromeos/verstage.a -$(VERSTAGE_LIB): $$(verstage-objs) - @printf " AR $(subst $(obj)/,,$(@))\n" - $(AR_verstage) rc $@.tmp $(verstage-objs) - @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" - $(OBJCOPY_verstage) --prefix-symbols=verstage_ $@.tmp $@ -endif |