<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22434">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/kahlee: Remove mainboard.h<br><br>mainboard.h only had a single function definition.  Move it into<br>baseboard/variants.h and get rid of the file.<br><br>TEST=Build grunt/kahlee<br>BUG=b:69164070<br><br>Change-Id: I6b7d50d5c949733d77c42b4daf56ed1f97ed6954<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/kahlee/mainboard.c<br>D src/mainboard/google/kahlee/mainboard.h<br>M src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>M src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>5 files changed, 5 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/22434/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c<br>index c7689c8..9c3f4ad 100644<br>--- a/src/mainboard/google/kahlee/mainboard.c<br>+++ b/src/mainboard/google/kahlee/mainboard.c<br>@@ -19,7 +19,7 @@<br> #include <agesawrapper.h><br> #include <amd_pci_util.h><br> #include <ec.h><br>-#include <mainboard.h><br>+#include <baseboard/variants.h><br> #include <soc/smi.h><br> #include <vendorcode/google/chromeos/chromeos.h><br> <br>diff --git a/src/mainboard/google/kahlee/mainboard.h b/src/mainboard/google/kahlee/mainboard.h<br>deleted file mode 100644<br>index 5540d1b..0000000<br>--- a/src/mainboard/google/kahlee/mainboard.h<br>+++ /dev/null<br>@@ -1,23 +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>-#ifndef MAINBOARD_H<br>-#define MAINBOARD_H<br>-<br>-#include <soc/smi.h><br>-<br>-const struct sci_source *get_gpe_table(size_t *num);<br>-<br>-#endif /* MAINBOARD_H */<br>diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>index 175a321..84e40b0 100644<br>--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c<br>@@ -15,7 +15,7 @@<br> <br> #include <AGESA.h><br> #include <FchPlatform.h><br>-#include <mainboard.h><br>+#include <baseboard/variants.h><br> #include <soc/smi.h><br> #include <soc/southbridge.h><br> #include <stdlib.h><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 3b4da26..0a57808 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>@@ -18,7 +18,9 @@<br> #define __BASEBOARD_VARIANTS_H__<br> <br> #include <stddef.h><br>+#include <soc/smi.h><br> <br>+const struct sci_source *get_gpe_table(size_t *num);<br> size_t variant_board_id(void);<br> <br> #endif /* __BASEBOARD_VARIANTS_H__ */<br>diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>index e25f1a1..3e981f5 100644<br>--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c<br>@@ -15,7 +15,7 @@<br> <br> #include <AGESA.h><br> #include <FchPlatform.h><br>-#include <mainboard.h><br>+#include <baseboard/variants.h><br> #include <soc/smi.h><br> #include <soc/southbridge.h><br> #include <stdlib.h><br></pre><p>To view, visit <a href="https://review.coreboot.org/22434">change 22434</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/22434"/><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: I6b7d50d5c949733d77c42b4daf56ed1f97ed6954 </div>
<div style="display:none"> Gerrit-Change-Number: 22434 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>