oak/gru: Fix derivative Kconfigs
Add a few missing Kconfig defaults for derivatives of the Oak and Gru
baseboards. Also group all Kconfigs that must change for derivatives
together for easier updating.
BRANCH=None
BUG=None
TEST=None
Change-Id: I95ebb08b4f13f09f2539b451d7b96a826ddf98f8
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: ae3f13c1dc323f4c7c4a176a4f5e1285fec312ce
Original-Change-Id: I658130e88daa2d113fd722b0527cf0e7ab66c7ef
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/357922
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/15605
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 56b362f..47aa093 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -47,11 +47,6 @@
string
default google/gru
-config MAINBOARD_PART_NUMBER
- string
- default "Kevin" if BOARD_GOOGLE_KEVIN
- default "Gru"
-
config MAINBOARD_VENDOR
string
default "Google"
@@ -73,4 +68,18 @@
depends on DRIVERS_UART
default 0xFF1A0000
+##########################################################
+#### Update below when adding a new derivative board. ####
+##########################################################
+config MAINBOARD_PART_NUMBER
+ string
+ default "Gru" if BOARD_GOOGLE_GRU
+ default "Kevin" if BOARD_GOOGLE_KEVIN
+
+config GBB_HWID
+ string
+ depends on CHROMEOS
+ default "GRU TEST 5431" if BOARD_GOOGLE_GRU
+ default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN
+
endif # BOARD_GOOGLE_GRU_COMMON
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 24095f5..5ab6f2d 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -44,11 +44,6 @@
string
default google/oak
-config MAINBOARD_PART_NUMBER
- string
- default "Elm" if BOARD_GOOGLE_ELM
- default "Oak" if BOARD_GOOGLE_OAK
-
config MAINBOARD_VENDOR
string
default "Google"
@@ -77,15 +72,24 @@
string
default "oak_pd"
+##########################################################
+#### Update below when adding a new derivative board. ####
+##########################################################
+config MAINBOARD_PART_NUMBER
+ string
+ default "Oak" if BOARD_GOOGLE_OAK
+ default "Elm" if BOARD_GOOGLE_ELM
+
config GBB_HWID
string
depends on CHROMEOS
- default "OAK TEST 6858"
+ default "OAK TEST 6858" if BOARD_GOOGLE_OAK
+ default "ELM TEST 3839" if BOARD_GOOGLE_ELM
# All Oak-derivatives count their board IDs as 0 being equivalent to Oak rev6.
config BOARD_ID_ADJUSTMENT
int
default 0 if BOARD_GOOGLE_OAK
- default 7
+ default 7 if BOARD_GOOGLE_ELM
endif # BOARD_GOOGLE_OAK