<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22184">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/Kahlee: Combine BiosCallOuts files<br><br>There's no need to have these separated.<br><br>BUG=b:64932381<br>Test=Build & Boot<br><br>Change-Id: I22898d3bf95d5e9a8fc2643bfccae1e2f5b29e44<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/BiosCallOuts.c<br>M src/mainboard/google/kahlee/Makefile.inc<br>D src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>3 files changed, 6 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/22184/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/BiosCallOuts.c b/src/mainboard/google/kahlee/BiosCallOuts.c<br>index 49f7190..bf590ec 100644<br>--- a/src/mainboard/google/kahlee/BiosCallOuts.c<br>+++ b/src/mainboard/google/kahlee/BiosCallOuts.c<br>@@ -21,6 +21,11 @@<br> <br> extern const GPIO_CONTROL oem_kahlee_gpio[];<br> <br>+void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)<br>+{<br>+       FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio;<br>+}<br>+<br> void platform_FchParams_env(FCH_DATA_BLOCK *FchParams_env)<br> {<br>      FchParams_env->PostOemGpioTable = (void *)oem_kahlee_gpio;<br>diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc<br>index d0a7836..fb381bf 100644<br>--- a/src/mainboard/google/kahlee/Makefile.inc<br>+++ b/src/mainboard/google/kahlee/Makefile.inc<br>@@ -14,7 +14,7 @@<br> #<br> <br> bootblock-y += bootblock/bootblock.c<br>-bootblock-y += bootblock/BiosCallOuts.c<br>+bootblock-y += BiosCallOuts.c<br> bootblock-y += bootblock/OemCustomize.c<br> bootblock-y += ec.c<br> bootblock-y += gpio.c<br>diff --git a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c b/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>deleted file mode 100644<br>index 3ca3c6f..0000000<br>--- a/src/mainboard/google/kahlee/bootblock/BiosCallOuts.c<br>+++ /dev/null<br>@@ -1,27 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2015-2016 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 <AGESA.h><br>-#include <BiosCallOuts.h><br>-#include <FchPlatform.h><br>-#include <soc/southbridge.h><br>-#include <stdlib.h><br>-<br>-extern const GPIO_CONTROL oem_kahlee_gpio[];<br>-<br>-void platform_FchParams_reset(FCH_RESET_DATA_BLOCK *FchParams_reset)<br>-{<br>-      FchParams_reset->EarlyOemGpioTable = (void *)oem_kahlee_gpio;<br>-}<br></pre><p>To view, visit <a href="https://review.coreboot.org/22184">change 22184</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/22184"/><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: I22898d3bf95d5e9a8fc2643bfccae1e2f5b29e44 </div>
<div style="display:none"> Gerrit-Change-Number: 22184 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>