diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-02-13 17:53:29 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-03-28 22:18:13 +0200 |
| commit | 58c3938705af5dd96456216a17d579868e0f5b77 (patch) | |
| tree | b1531c163a2679c76395090717e835a851e027ae /src/soc/marvell | |
| parent | 73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff) | |
| download | coreboot-58c3938705af5dd96456216a17d579868e0f5b77.tar.xz | |
vboot: Move remaining features out of vendorcode/google/chromeos
This patch attempts to finish the separation between CONFIG_VBOOT and
CONFIG_CHROMEOS by moving the remaining options and code (including
image generation code for things like FWID and GBB flags, which are
intrinsic to vboot itself) from src/vendorcode/google/chromeos to
src/vboot. Also taking this opportunity to namespace all VBOOT Kconfig
options, and clean up menuconfig visibility for them (i.e. some options
were visible even though they were tied to the hardware while others
were invisible even though it might make sense to change them).
CQ-DEPEND=CL:459088
Change-Id: I3e2e31150ebf5a96b6fe507ebeb53a41ecf88122
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/18984
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/marvell')
| -rw-r--r-- | src/soc/marvell/armada38x/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/marvell/bg4cd/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/marvell/mvmap2315/Kconfig | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/soc/marvell/armada38x/Kconfig b/src/soc/marvell/armada38x/Kconfig index ed8cbe8100..20f9d09c89 100644 --- a/src/soc/marvell/armada38x/Kconfig +++ b/src/soc/marvell/armada38x/Kconfig @@ -7,13 +7,15 @@ config SOC_MARVELL_ARMADA38X select ARCH_RAMSTAGE_ARMV7 select HAVE_UART_SPECIAL select BOOTBLOCK_CONSOLE - select RETURN_FROM_VERSTAGE select BOOTBLOCK_CUSTOM select GENERIC_UDELAY select UART_OVERRIDE_REFCLK if SOC_MARVELL_ARMADA38X +config VBOOT + select VBOOT_RETURN_FROM_VERSTAGE + config BOOTBLOCK_CPU_INIT string default "soc/marvell/armada38x/bootblock.c" diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index cdd8597de8..6f9b6aab32 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -28,7 +28,7 @@ config SOC_MARVELL_BG4CD if SOC_MARVELL_BG4CD -config CHROMEOS +config VBOOT select VBOOT_STARTS_IN_BOOTBLOCK endif diff --git a/src/soc/marvell/mvmap2315/Kconfig b/src/soc/marvell/mvmap2315/Kconfig index 45e03c1e77..072f4eee01 100644 --- a/src/soc/marvell/mvmap2315/Kconfig +++ b/src/soc/marvell/mvmap2315/Kconfig @@ -31,8 +31,7 @@ config SOC_MARVELL_MVMAP2315 if SOC_MARVELL_MVMAP2315 -config CHROMEOS - select VBOOT +config VBOOT select VBOOT_STARTS_IN_ROMSTAGE config CONSOLE_SERIAL_MVMAP2315_UART_ADDRESS |