<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/26968">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/mainboard/kahlee: Use common mainboard and romstage files<br><br>Until these need to be separated out, use a common file for mainboard<br>and romstage to make upkeep easier.<br><br>BUG=b:80106042<br>TEST=Build Grunt and Careena<br><br>Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686<br>Signed-off-by: Martin Roth <martinroth@google.com><br>Reviewed-on: https://review.coreboot.org/26968<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Raul Rangel <rrangel@chromium.org><br>---<br>R src/mainboard/google/kahlee/variants/baseboard/mainboard.c<br>R src/mainboard/google/kahlee/variants/baseboard/romstage.c<br>M src/mainboard/google/kahlee/variants/careena/Makefile.inc<br>M src/mainboard/google/kahlee/variants/grunt/Makefile.inc<br>D src/mainboard/google/kahlee/variants/grunt/mainboard.c<br>D src/mainboard/google/kahlee/variants/grunt/romstage.c<br>6 files changed, 4 insertions(+), 57 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/variants/careena/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/careena/mainboard.c</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/mainboard.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/careena/romstage.c b/src/mainboard/google/kahlee/variants/baseboard/romstage.c</span><br><span>similarity index 100%</span><br><span>rename from src/mainboard/google/kahlee/variants/careena/romstage.c</span><br><span>rename to src/mainboard/google/kahlee/variants/baseboard/romstage.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>index 36f55fd..0579e18 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>+++ b/src/mainboard/google/kahlee/variants/careena/Makefile.inc</span><br><span>@@ -15,6 +15,6 @@</span><br><span> </span><br><span> subdirs-y += ../baseboard/spd</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += romstage.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../baseboard/romstage.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += mainboard.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../baseboard/mainboard.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>index 36f55fd..0579e18 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc</span><br><span>@@ -15,6 +15,6 @@</span><br><span> </span><br><span> subdirs-y += ../baseboard/spd</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += romstage.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../baseboard/romstage.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += mainboard.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../baseboard/mainboard.c</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/mainboard.c b/src/mainboard/google/kahlee/variants/grunt/mainboard.c</span><br><span>deleted file mode 100644</span><br><span>index c873299..0000000</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/mainboard.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,27 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright 2018 Google LLC</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <baseboard/variants.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t variant_board_sku(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- static int sku = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    if (sku == -1)</span><br><span style="color: hsl(0, 100%, 40%);">-          sku = google_chromeec_get_sku_id();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     return sku;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/grunt/romstage.c b/src/mainboard/google/kahlee/variants/grunt/romstage.c</span><br><span>deleted file mode 100644</span><br><span>index 2b8baf8..0000000</span><br><span>--- a/src/mainboard/google/kahlee/variants/grunt/romstage.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,26 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2018 Google, LLC.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <baseboard/variants.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <ec/google/chromeec/ec.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void variant_romstage_entry(int s3_resume)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      uint32_t sku = google_chromeec_get_sku_id();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    /* Based on SKU, turn on keyboard backlight to show system is booting */</span><br><span style="color: hsl(0, 100%, 40%);">-        if (sku <= 6 && !s3_resume)</span><br><span style="color: hsl(0, 100%, 40%);">-          google_chromeec_kbbacklight(75);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26968">change 26968</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26968"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I65188bee1958d442bfe64637c3b93dc05583a686 </div>
<div style="display:none"> Gerrit-Change-Number: 26968 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Raul Rangel <rrangel@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>