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: I658130e88daa2d113fd722b0527cf0e7ab66c7ef
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/357922
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Julius Werner 2016-07-01 11:22:25 -07:00 committed by chrome-bot
parent 46d5fa7297
commit ae3f13c1dc
2 changed files with 25 additions and 12 deletions

View file

@ -47,11 +47,6 @@ config MAINBOARD_DIR
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 @@ config CONSOLE_SERIAL_UART_ADDRESS
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

View file

@ -44,11 +44,6 @@ config MAINBOARD_DIR
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 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME
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