diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-04-22 10:41:42 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-28 16:09:56 +0200 |
commit | 1124cec59a2c705a4ef3740dbdf0f68113602d31 (patch) | |
tree | e5c519b0539e581c05c9d9f610a1a6deea9cd3a6 /src/soc | |
parent | 6d65f796db04927bfc8324f50ad0816cec9673b6 (diff) | |
download | coreboot-staging-1124cec59a2c705a4ef3740dbdf0f68113602d31.zip coreboot-staging-1124cec59a2c705a4ef3740dbdf0f68113602d31.tar.gz |
chromeos: remove VBOOT2_VERIFY_FIRMWARE option
There's no need to have the VBOOT2_VERIFY_FIRMWARE
distinction because it's the only game in town.
Change-Id: I82aab665934c27829e1a04115bf499ae527a91aa
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9958
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r-- | src/soc/marvell/bg4cd/Kconfig | 2 | ||||
-rw-r--r-- | src/soc/marvell/bg4cd/Makefile.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 725f561..96fd8ef 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -24,7 +24,7 @@ config SOC_MARVELL_BG4CD select ARCH_RAMSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_VERSTAGE_ARMV7_M - select ARM_BOOTBLOCK_CUSTOM if VBOOT2_VERIFY_FIRMWARE + select ARM_BOOTBLOCK_CUSTOM if VBOOT_VERIFY_FIRMWARE select BOOTBLOCK_CONSOLE select CPU_HAS_BOOTBLOCK_INIT select DYNAMIC_CBMEM diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc index a540250..4a58e6f 100644 --- a/src/soc/marvell/bg4cd/Makefile.inc +++ b/src/soc/marvell/bg4cd/Makefile.inc @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -bootblock-$(CONFIG_VBOOT2_VERIFY_FIRMWARE) += bootblock_asm.S -bootblock-$(CONFIG_VBOOT2_VERIFY_FIRMWARE) += bootblock.c +bootblock-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += bootblock_asm.S +bootblock-$(CONFIG_VBOOT_VERIFY_FIRMWARE) += bootblock.c bootblock-y += cbmem.c bootblock-y += i2c.c |