From beb0468fced261ced7ddbb8a1f982edcaf6cce8c Mon Sep 17 00:00:00 2001 From: Ege Mihmanli Date: Mon, 20 Nov 2017 11:54:02 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/22542 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/mainboard/google/gru/mainboard.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/mainboard/google/gru/mainboard.c') 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); -- cgit v1.2.3