Martin Roth has uploaded this change for review. ( https://review.coreboot.org/26969
Change subject: mainboard/google/kahlee: Turn on backlight for all SKUs
......................................................................
mainboard/google/kahlee: Turn on backlight for all SKUs
Careena uses a different keyboard backlight method, so let the EC
handle the different SKUs and backlight methods.
BUG=b:80106042
TEST=None
Change-Id: I47f7a9ac13538f0216fbb0f64fdd22f66097820c
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
M src/mainboard/google/kahlee/variants/baseboard/romstage.c
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/26969/1
diff --git a/src/mainboard/google/kahlee/variants/baseboard/romstage.c b/src/mainboard/google/kahlee/variants/baseboard/romstage.c
index 2b8baf8..f87a9d6 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/romstage.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/romstage.c
@@ -18,9 +18,6 @@
void variant_romstage_entry(int s3_resume)
{
- uint32_t sku = google_chromeec_get_sku_id();
-
- /* Based on SKU, turn on keyboard backlight to show system is booting */
- if (sku <= 6 && !s3_resume)
+ if (!s3_resume)
google_chromeec_kbbacklight(75);
}
--
To view, visit https://review.coreboot.org/26969
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47f7a9ac13538f0216fbb0f64fdd22f66097820c
Gerrit-Change-Number: 26969
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/26968
Change subject: src/mainboard/kahlee: Use common mainboard and romstage files
......................................................................
src/mainboard/kahlee: Use common mainboard and romstage files
Until these need to be separated out, use a common file for mainboard
and romstage to make upkeep easier.
BUG=b:80106042
TEST=Build Grunt and Careena
Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
R src/mainboard/google/kahlee/variants/baseboard/mainboard.c
R src/mainboard/google/kahlee/variants/baseboard/romstage.c
M src/mainboard/google/kahlee/variants/careena/Makefile.inc
M src/mainboard/google/kahlee/variants/grunt/Makefile.inc
D src/mainboard/google/kahlee/variants/grunt/mainboard.c
D src/mainboard/google/kahlee/variants/grunt/romstage.c
6 files changed, 4 insertions(+), 57 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/26968/1
diff --git a/src/mainboard/google/kahlee/variants/careena/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
similarity index 100%
rename from src/mainboard/google/kahlee/variants/careena/mainboard.c
rename to src/mainboard/google/kahlee/variants/baseboard/mainboard.c
diff --git a/src/mainboard/google/kahlee/variants/careena/romstage.c b/src/mainboard/google/kahlee/variants/baseboard/romstage.c
similarity index 100%
rename from src/mainboard/google/kahlee/variants/careena/romstage.c
rename to src/mainboard/google/kahlee/variants/baseboard/romstage.c
diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc
index 36f55fd..0579e18 100644
--- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc
@@ -15,6 +15,6 @@
subdirs-y += ../baseboard/spd
-romstage-y += romstage.c
+romstage-y += ../baseboard/romstage.c
-ramstage-y += mainboard.c
+ramstage-y += ../baseboard/mainboard.c
diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
index 36f55fd..0579e18 100644
--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
@@ -15,6 +15,6 @@
subdirs-y += ../baseboard/spd
-romstage-y += romstage.c
+romstage-y += ../baseboard/romstage.c
-ramstage-y += mainboard.c
+ramstage-y += ../baseboard/mainboard.c
diff --git a/src/mainboard/google/kahlee/variants/grunt/mainboard.c b/src/mainboard/google/kahlee/variants/grunt/mainboard.c
deleted file mode 100644
index c873299..0000000
--- a/src/mainboard/google/kahlee/variants/grunt/mainboard.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2018 Google LLC
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <ec/google/chromeec/ec.h>
-#include <baseboard/variants.h>
-
-uint8_t variant_board_sku(void)
-{
- static int sku = -1;
-
- if (sku == -1)
- sku = google_chromeec_get_sku_id();
-
- return sku;
-}
diff --git a/src/mainboard/google/kahlee/variants/grunt/romstage.c b/src/mainboard/google/kahlee/variants/grunt/romstage.c
deleted file mode 100644
index 2b8baf8..0000000
--- a/src/mainboard/google/kahlee/variants/grunt/romstage.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2018 Google, LLC.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <baseboard/variants.h>
-#include <ec/google/chromeec/ec.h>
-
-void variant_romstage_entry(int s3_resume)
-{
- uint32_t sku = google_chromeec_get_sku_id();
-
- /* Based on SKU, turn on keyboard backlight to show system is booting */
- if (sku <= 6 && !s3_resume)
- google_chromeec_kbbacklight(75);
-}
--
To view, visit https://review.coreboot.org/26968
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686
Gerrit-Change-Number: 26968
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth(a)google.com>
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/26930 )
Change subject: amd/stoneyridge: Set SCI_MAP for SCI enabled GPIOs
......................................................................
Patch Set 4:
Build Successful
https://qa.coreboot.org/job/coreboot-gerrit/74560/ : SUCCESS
--
To view, visit https://review.coreboot.org/26930
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7be45264f9bfec56efc47a03071fdb924d16b6a
Gerrit-Change-Number: 26930
Gerrit-PatchSet: 4
Gerrit-Owner: Daniel Kurtz <djkurtz(a)google.com>
Gerrit-Reviewer: Daniel Kurtz <djkurtz(a)chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Richard Spiegel <richard.spiegel(a)silverbackltd.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Thu, 07 Jun 2018 17:35:26 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No