summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEge Mihmanli <egemih@google.com>2017-11-20 11:54:02 -0800
committerJulius Werner <jwerner@chromium.org>2017-11-22 19:09:39 +0000
commitbeb0468fced261ced7ddbb8a1f982edcaf6cce8c (patch)
treed816686964d59c900e16131b94f16f48639b384a /src
parentae01634e47326f83f74e5d3d729130343eb78f32 (diff)
downloadcoreboot-beb0468fced261ced7ddbb8a1f982edcaf6cce8c.tar.xz
google/gru: Add support for rainier
Rainier is a scarlet-derived board but uses eDP as opposed to MIPI. Using GRU_BASEBOARD_SCARLET is enough, except for display related logic. In those cases, use board specific logic instead of baseboard. Change-Id: I596f7ca6bc26312ecaeb261c96cebd46974c2cdf Signed-off-by: Ege Mihmanli <egemih@google.com> Reviewed-on: https://review.coreboot.org/22542 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/gru/Kconfig4
-rw-r--r--src/mainboard/google/gru/Kconfig.name4
-rw-r--r--src/mainboard/google/gru/mainboard.c6
3 files changed, 12 insertions, 2 deletions
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 3026c7e4ec..0a17138fb8 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -37,7 +37,7 @@ config GRU_HAS_WLAN_RESET
config GRU_BASEBOARD_SCARLET
bool
- default y if BOARD_GOOGLE_SCARLET
+ default y if BOARD_GOOGLE_SCARLET || BOARD_GOOGLE_RAINIER
default n
config BOARD_SPECIFIC_OPTIONS
@@ -115,6 +115,7 @@ config MAINBOARD_PART_NUMBER
default "Gru" if BOARD_GOOGLE_GRU
default "Kevin" if BOARD_GOOGLE_KEVIN
default "Nefario" if BOARD_GOOGLE_NEFARIO
+ default "Rainier" if BOARD_GOOGLE_RAINIER
config GBB_HWID
string
@@ -124,5 +125,6 @@ config GBB_HWID
default "GRU TEST 5431" if BOARD_GOOGLE_GRU
default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN
default "NEFARIO TEST 3735" if BOARD_GOOGLE_NEFARIO
+ default "RAINIER TEST 9752" if BOARD_GOOGLE_RAINIER
endif # BOARD_GOOGLE_GRU_COMMON
diff --git a/src/mainboard/google/gru/Kconfig.name b/src/mainboard/google/gru/Kconfig.name
index c1e5cd632b..f83c3d71b2 100644
--- a/src/mainboard/google/gru/Kconfig.name
+++ b/src/mainboard/google/gru/Kconfig.name
@@ -17,3 +17,7 @@ config BOARD_GOOGLE_SCARLET
config BOARD_GOOGLE_NEFARIO
bool "Nefario"
select BOARD_GOOGLE_GRU_COMMON
+
+config BOARD_GOOGLE_RAINIER
+ bool "Rainier"
+ select BOARD_GOOGLE_GRU_COMMON
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index 99b335a810..076cfa1d15 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -237,7 +237,11 @@ static void configure_codec(void)
static void configure_display(void)
{
- if (IS_ENABLED(CONFIG_GRU_BASEBOARD_SCARLET)) {
+ /*
+ * Rainier is Scarlet-derived, but uses EDP so use board-specific
+ * config rather than baseboard.
+ */
+ if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) {
gpio_output(GPIO(4, D, 1), 0); /* DISPLAY_RST_L */
gpio_output(GPIO(4, D, 3), 1); /* PPVARP_LCD */
mdelay(10);