From 599c32d8ef908f0b9723eb864f0a8695f6a76758 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 3 Dec 2014 12:09:58 -0800 Subject: marvell/bg4cd: merge verstage into bootblock If verified boot is enabled, merge verstage into bootblock. This also requires custom bootblock code to actually call into verstage. [pg: modified to match upstream] BUG=chrome-os-partner:32631 BRANCH=ToT TEST=booted on cosmos development board. Change-Id: I53251aac966ee15da24232c23fefa636de8b253b Signed-off-by: Patrick Georgi Original-Commit-Id: 2b8ada263017b46afa755b5acb759574184dba06 Original-Signed-off-by: Daisuke Nojiri Original-Change-Id: Ia0e1236357aa32bf553fb8cc98f3a8d29de17f45 Original-Reviewed-on: https://chromium-review.googlesource.com/229795 Original-Reviewed-by: Julius Werner Reviewed-on: http://review.coreboot.org/10008 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Stefan Reinauer --- src/mainboard/google/cosmos/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainboard/google/cosmos') diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index 49d317242a..8cd9983c48 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS - select RETURN_FROM_VERSTAGE select SOC_MARVELL_BG4CD select SPI_FLASH select SPI_FLASH_SPANSION -- cgit v1.2.3