From f9cbe353193a506fb687f137ddd7b082b0da5a49 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Tue, 26 Apr 2016 14:43:53 -0700 Subject: [PATCH] google/gru: add board name Gru is the common name of a set of coreboot boards, each of them has the config option BOARD_GOOGLE_GRU enabled. Now we need to add the actual board called Gru to the set. Let's rename the common config option to BOARD_GOOGLE_GRU_COMMON and use BOARD_GOOGLE_GRU for the actual board. BRANCH=none BUG=none TEST=with corresponding depthcharge and configuration space changes it is possible to build the Gru board which boots the kernel using the proper compatibility string of google,gru-rev0 Change-Id: I363d4b690b7549f50ed75d77b56e6a1e1d17b60f Signed-off-by: Patrick Georgi Original-Commit-Id: 327ecc0de20ac0b93ec3cd28ef398393d4ea7c42 Original-Change-Id: Ia43278225c2d32d2af37193a77ea792551c9f8d9 Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/340793 Original-Reviewed-by: Julius Werner Reviewed-on: https://review.coreboot.org/14724 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/gru/Kconfig | 6 +++--- src/mainboard/google/gru/Kconfig.name | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index 6f234ad332..940a8d24e2 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -13,10 +13,10 @@ ## GNU General Public License for more details. ## -config BOARD_GOOGLE_GRU # Umbrella option to be selected by variant boards. +config BOARD_GOOGLE_GRU_COMMON # Umbrella option to be selected by variant boards. def_bool n -if BOARD_GOOGLE_GRU +if BOARD_GOOGLE_GRU_COMMON config BOARD_SPECIFIC_OPTIONS def_bool y @@ -65,4 +65,4 @@ config CONSOLE_SERIAL_UART_ADDRESS depends on DRIVERS_UART default 0xFF1A0000 -endif # BOARD_GOOGLE_GRU +endif # BOARD_GOOGLE_GRU_COMMON diff --git a/src/mainboard/google/gru/Kconfig.name b/src/mainboard/google/gru/Kconfig.name index bd5037e87c..f3f2cef27c 100644 --- a/src/mainboard/google/gru/Kconfig.name +++ b/src/mainboard/google/gru/Kconfig.name @@ -1,3 +1,7 @@ config BOARD_GOOGLE_KEVIN bool "Kevin" - select BOARD_GOOGLE_GRU + select BOARD_GOOGLE_GRU_COMMON + +config BOARD_GOOGLE_GRU + bool "Gru" + select BOARD_GOOGLE_GRU_COMMON