<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/22515">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Marc Jones: Looks good to me, approved
build bot (Jenkins): Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Update memory.c<br><br>This fixes some issues with the initial implementation that was copied<br>from reef.<br>- The board ID value shouldn't be size_t - it's not a size.<br>- Kahlee doesn't even need the memory.c file - it uses an SoDIMM.<br><br>BUG=b:68293392<br>TEST=build stoney platforms, boot kahleebo<br><br>Change-Id: Ife5660d36912e887edfd0365a9f16c5a172c9c86<br>Signed-off-by: Martin Roth <martinroth@google.com><br>Reviewed-on: https://review.coreboot.org/22515<br>Reviewed-by: Marc Jones <marc@marcjonesconsulting.com><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/kahlee/variants/baseboard/memory.c<br>M src/mainboard/google/kahlee/variants/kahlee/Makefile.inc<br>D src/mainboard/google/kahlee/variants/kahlee/memory.c<br>4 files changed, 3 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">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 b4e0891..cf995fc 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>-size_t variant_board_id(void);<br>+uint8_t variant_board_id(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 511241f..ae8734e 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>-size_t __attribute__((weak)) variant_board_id(void)<br>+uint8_t __attribute__((weak)) variant_board_id(void)<br> {<br> gpio_t pads[] = {<br> [3] = MEM_CONFIG3,<br>@@ -26,5 +26,5 @@<br> [0] = MEM_CONFIG0,<br> };<br> <br>- return gpio_pullup_base2_value(pads, ARRAY_SIZE(pads));<br>+ return gpio_base2_value(pads, ARRAY_SIZE(pads));<br> }<br>diff --git a/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc b/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc<br>index 94f3889..c5aab8e 100644<br>--- a/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc<br>+++ b/src/mainboard/google/kahlee/variants/kahlee/Makefile.inc<br>@@ -16,7 +16,5 @@<br> bootblock-y += gpio.c<br> <br> romstage-y += gpio.c<br>-romstage-y += memory.c<br> <br> ramstage-y += gpio.c<br>-ramstage-y += memory.c<br>diff --git a/src/mainboard/google/kahlee/variants/kahlee/memory.c b/src/mainboard/google/kahlee/variants/kahlee/memory.c<br>deleted file mode 100644<br>index 4341b82..0000000<br>--- a/src/mainboard/google/kahlee/variants/kahlee/memory.c<br>+++ /dev/null<br>@@ -1,29 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright 2017 Google 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 <gpio.h> /* src/include/gpio.h */<br>-#include <baseboard/variants.h><br>-#include <baseboard/gpio.h><br>-<br>-size_t variant_board_id(void)<br>-{<br>- gpio_t pads[] = {<br>- [2] = MEM_CONFIG2,<br>- [1] = MEM_CONFIG1,<br>- [0] = MEM_CONFIG0,<br>- };<br>-<br>- return gpio_pullup_base2_value(pads, ARRAY_SIZE(pads));<br>-}<br></pre><p>To view, visit <a href="https://review.coreboot.org/22515">change 22515</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/22515"/><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: Ife5660d36912e887edfd0365a9f16c5a172c9c86 </div>
<div style="display:none"> Gerrit-Change-Number: 22515 </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: Marc Jones <marc@marcjonesconsulting.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>