summaryrefslogtreecommitdiff
path: root/src/mainboard/google/veyron
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-02-13 17:53:29 -0800
committerJulius Werner <jwerner@chromium.org>2017-03-28 22:18:13 +0200
commit58c3938705af5dd96456216a17d579868e0f5b77 (patch)
treeb1531c163a2679c76395090717e835a851e027ae /src/mainboard/google/veyron
parent73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff)
downloadcoreboot-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/mainboard/google/veyron')
-rw-r--r--src/mainboard/google/veyron/Kconfig15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 3eb32525a1..5fb340bcfc 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -45,7 +45,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
-config CHROMEOS
+config VBOOT
select VBOOT_VBNV_EC
config MAINBOARD_DIR
@@ -54,6 +54,11 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER
string
+ default "Veyron_Jaq" if BOARD_GOOGLE_VEYRON_JAQ
+ default "Veyron_Jerry" if BOARD_GOOGLE_VEYRON_JERRY
+ default "Veyron_Mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
+ default "Veyron_Minnie" if BOARD_GOOGLE_VEYRON_MINNIE
+ default "Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
default "Veyron"
config MAINBOARD_VENDOR
@@ -112,12 +117,4 @@ config GBB_HWID
default "MINNIE TEST A-A 5151" if BOARD_GOOGLE_VEYRON_MINNIE
default "SPEEDY TEST A-A 8421" if BOARD_GOOGLE_VEYRON_SPEEDY
-config CHROMEOS_FWID_MODEL
- string
- default "Google_Veyron_Jaq" if BOARD_GOOGLE_VEYRON_JAQ
- default "Google_Veyron_Jerry" if BOARD_GOOGLE_VEYRON_JERRY
- default "Google_Veyron_Mighty" if BOARD_GOOGLE_VEYRON_MIGHTY
- default "Google_Veyron_Minnie" if BOARD_GOOGLE_VEYRON_MINNIE
- default "Google_Veyron_Speedy" if BOARD_GOOGLE_VEYRON_SPEEDY
-
endif # BOARD_GOOGLE_VEYRON