[coreboot-gerrit] Change in coreboot[master]: google/gru: Add support for rainier

[Ege Mihmanli (Code Review)]

Ege Mihmanli has uploaded this change for review. ( https://review.coreboot.org/22542


Change subject: google/gru: Add support for rainier
......................................................................

google/gru: Add support for rainier

Rainier is a scarlet-derived board that varies only in display
configuration.

Change-Id: I596f7ca6bc26312ecaeb261c96cebd46974c2cdf
Signed-off-by: Ege Mihmanli <egemih at google.com>
---
M src/mainboard/google/gru/Kconfig
M src/mainboard/google/gru/Kconfig.name
M src/mainboard/google/gru/mainboard.c
3 files changed, 12 insertions(+), 2 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/22542/1

diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index 3026c7e..0a17138 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -37,7 +37,7 @@
 
 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 @@
 	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 @@
 	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 c1e5cd6..f83c3d7 100644
--- a/src/mainboard/google/gru/Kconfig.name
+++ b/src/mainboard/google/gru/Kconfig.name
@@ -17,3 +17,7 @@
 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 99b335a..076cfa1 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -237,7 +237,11 @@
 
 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);

-- 
To view, visit https://review.coreboot.org/22542
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I596f7ca6bc26312ecaeb261c96cebd46974c2cdf
Gerrit-Change-Number: 22542
Gerrit-PatchSet: 1
Gerrit-Owner: Ege Mihmanli <egemih at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171120/3abe66ee/attachment.html>