<p>Karthik Ramasubramanian has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28609">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/zoombini: Use Chrome EC BOARDID definition<br><br>The board_id() definition is the duplicate of chrome EC board_id<br>definition. Remove the duplicate definition and select<br>EC_GOOGLE_CHROMEEC_BOARDID Kconfig item.<br><br>BUG=b:114001972,b:114677884,b:114677887<br><br>Change-Id: Id8b7027d653649e8e5791e455652c4e893a746c2<br>Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org><br>Tested-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org><br>---<br>M src/mainboard/google/zoombini/Kconfig<br>M src/mainboard/google/zoombini/Makefile.inc<br>D src/mainboard/google/zoombini/boardid.c<br>3 files changed, 1 insertion(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/28609/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/zoombini/Kconfig b/src/mainboard/google/zoombini/Kconfig</span><br><span>index 656d8b0..249b028 100644</span><br><span>--- a/src/mainboard/google/zoombini/Kconfig</span><br><span>+++ b/src/mainboard/google/zoombini/Kconfig</span><br><span>@@ -7,6 +7,7 @@</span><br><span> select DRIVERS_I2C_MAX98373</span><br><span> select DRIVERS_SPI_ACPI</span><br><span> select EC_GOOGLE_CHROMEEC</span><br><span style="color: hsl(120, 100%, 40%);">+ select EC_GOOGLE_CHROMEEC_BOARDID</span><br><span> select EC_GOOGLE_CHROMEEC_LPC</span><br><span> select HAVE_ACPI_RESUME</span><br><span> select HAVE_ACPI_TABLES</span><br><span>diff --git a/src/mainboard/google/zoombini/Makefile.inc b/src/mainboard/google/zoombini/Makefile.inc</span><br><span>index 241cfe2..d4e9fd4 100644</span><br><span>--- a/src/mainboard/google/zoombini/Makefile.inc</span><br><span>+++ b/src/mainboard/google/zoombini/Makefile.inc</span><br><span>@@ -19,12 +19,10 @@</span><br><span> </span><br><span> verstage-$(CONFIG_CHROMEOS) += chromeos.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += boardid.c</span><br><span> romstage-$(CONFIG_CHROMEOS) += chromeos.c</span><br><span> romstage-y += memory.c</span><br><span> romstage-y += romstage.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += boardid.c</span><br><span> ramstage-$(CONFIG_CHROMEOS) += chromeos.c</span><br><span> ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c</span><br><span> ramstage-y += mainboard.c</span><br><span>diff --git a/src/mainboard/google/zoombini/boardid.c b/src/mainboard/google/zoombini/boardid.c</span><br><span>deleted file mode 100644</span><br><span>index 7c68265..0000000</span><br><span>--- a/src/mainboard/google/zoombini/boardid.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,30 +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) 2017 Google Inc.</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 <boardid.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <stddef.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%);">-uint32_t board_id(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- MAYBE_STATIC uint32_t id = BOARD_ID_INIT;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (id == BOARD_ID_INIT) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (google_chromeec_get_board_version(&id))</span><br><span style="color: hsl(0, 100%, 40%);">- id = BOARD_ID_UNKNOWN;</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%);">- return id;</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/28609">change 28609</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/28609"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id8b7027d653649e8e5791e455652c4e893a746c2 </div>
<div style="display:none"> Gerrit-Change-Number: 28609 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Karthik Ramasubramanian <kramasub@google.com> </div>