<p>Marc Jones has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22561">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/kahlee: Rename board_id to memory_sku<br><br>Rename the GPIOs that are named as board_id to memory_skus.<br>Report the boardid received from the EC.<br><br>BUG=b:69649438<br><br>Change-Id: I84bacead3daf829c97f595c4c11a243953243c29<br>Signed-off-by: Marc Jones <marcj303@gmail.com><br>---<br>M src/mainboard/google/kahlee/Kconfig<br>M src/mainboard/google/kahlee/Makefile.inc<br>D src/mainboard/google/kahlee/boardid.c<br>M src/mainboard/google/kahlee/mainboard.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/kahlee/variants/baseboard/memory.c<br>6 files changed, 7 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/22561/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig<br>index 7173f1d..6cb9e2a 100644<br>--- a/src/mainboard/google/kahlee/Kconfig<br>+++ b/src/mainboard/google/kahlee/Kconfig<br>@@ -19,6 +19,7 @@<br> select BOARD_ROMSIZE_KB_8192<br> select DRIVERS_PS2_KEYBOARD<br> select EC_GOOGLE_CHROMEEC<br>+ select EC_GOOGLE_CHROMEEC_BOARDID<br> select EC_GOOGLE_CHROMEEC_LPC<br> select HAVE_OPTION_TABLE<br> select HAVE_ACPI_TABLES<br>diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc<br>index 131eba3..55c80a4 100644<br>--- a/src/mainboard/google/kahlee/Makefile.inc<br>+++ b/src/mainboard/google/kahlee/Makefile.inc<br>@@ -19,12 +19,10 @@<br> bootblock-y += ec.c<br> <br> romstage-y += BiosCallOuts.c<br>-romstage-y += boardid.c<br> romstage-y += chromeos.c<br> romstage-y += OemCustomize.c<br> <br> ramstage-y += BiosCallOuts.c<br>-ramstage-y += boardid.c<br> ramstage-y += chromeos.c<br> ramstage-y += ec.c<br> ramstage-y += OemCustomize.c<br>diff --git a/src/mainboard/google/kahlee/boardid.c b/src/mainboard/google/kahlee/boardid.c<br>deleted file mode 100644<br>index 5b59f32..0000000<br>--- a/src/mainboard/google/kahlee/boardid.c<br>+++ /dev/null<br>@@ -1,32 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2017 Advanced Micro Devices, Inc.<br>- *<br>- * This program is free software; you can redistribute it and/or modify<br>- * it under the terms of the GNU General Public License as published by<br>- * the Free Software Foundation; version 2 of the License.<br>- *<br>- * This program is distributed in the hope that it will be useful,<br>- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>- * GNU General Public License for more details.<br>- */<br>-<br>-#include <boardid.h><br>-#include <console/console.h><br>-#include <gpio.h><br>-#include <variant/gpio.h><br>-#include <baseboard/variants.h><br>-<br>-uint8_t board_id(void)<br>-{<br>- MAYBE_STATIC int id = -1;<br>-<br>- if (id < 0) {<br>- id = variant_board_id();<br>- printk(BIOS_SPEW, "Board ID: %#x.\n", id);<br>- }<br>-<br>- return id;<br>-}<br>diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c<br>index 643bda1..f757504 100644<br>--- a/src/mainboard/google/kahlee/mainboard.c<br>+++ b/src/mainboard/google/kahlee/mainboard.c<br>@@ -20,6 +20,7 @@<br> #include <amd_pci_util.h><br> #include <cbmem.h><br> #include <baseboard/variants.h><br>+#include <boardid.h><br> #include <soc/nvs.h><br> #include <soc/smi.h><br> #include <variant/ec.h><br>@@ -86,6 +87,9 @@<br> {<br> const struct sci_source *gpes;<br> size_t num;<br>+ int boardid = board_id();<br>+<br>+ printk(BIOS_INFO, "Board ID: %d\n", boardid);<br> <br> mainboard_ec_init();<br> <br>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>index cf995fc..45d287a 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>@@ -23,6 +23,6 @@<br> <br> const GPIO_CONTROL *get_gpio_table(void);<br> const struct sci_source *get_gpe_table(size_t *num);<br>-uint8_t variant_board_id(void);<br>+uint8_t variant_memory_sku(void);<br> <br> #endif /* __BASEBOARD_VARIANTS_H__ */<br>diff --git a/src/mainboard/google/kahlee/variants/baseboard/memory.c b/src/mainboard/google/kahlee/variants/baseboard/memory.c<br>index ae8734e..daa5ef9 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/memory.c<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/memory.c<br>@@ -17,7 +17,7 @@<br> #include <baseboard/variants.h><br> #include <variant/gpio.h><br> <br>-uint8_t __attribute__((weak)) variant_board_id(void)<br>+uint8_t __attribute__((weak)) variant_memory_sku(void)<br> {<br> gpio_t pads[] = {<br> [3] = MEM_CONFIG3,<br></pre><p>To view, visit <a href="https://review.coreboot.org/22561">change 22561</a>. To unsubscribe, 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/22561"/><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: I84bacead3daf829c97f595c4c11a243953243c29 </div>
<div style="display:none"> Gerrit-Change-Number: 22561 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>