[coreboot-gerrit] Change in coreboot[master]: mb/google/kahlee: Remove mainboard.h

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/22434


Change subject: mb/google/kahlee: Remove mainboard.h
......................................................................

mb/google/kahlee: Remove mainboard.h

mainboard.h only had a single function definition.  Move it into
baseboard/variants.h and get rid of the file.

TEST=Build grunt/kahlee
BUG=b:69164070

Change-Id: I6b7d50d5c949733d77c42b4daf56ed1f97ed6954
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/mainboard/google/kahlee/mainboard.c
D src/mainboard/google/kahlee/mainboard.h
M src/mainboard/google/kahlee/variants/baseboard/gpio.c
M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/kahlee/variants/kahlee/gpio.c
5 files changed, 5 insertions(+), 26 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/22434/1

diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index c7689c8..9c3f4ad 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -19,7 +19,7 @@
 #include <agesawrapper.h>
 #include <amd_pci_util.h>
 #include <ec.h>
-#include <mainboard.h>
+#include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
diff --git a/src/mainboard/google/kahlee/mainboard.h b/src/mainboard/google/kahlee/mainboard.h
deleted file mode 100644
index 5540d1b..0000000
--- a/src/mainboard/google/kahlee/mainboard.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2017 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef MAINBOARD_H
-#define MAINBOARD_H
-
-#include <soc/smi.h>
-
-const struct sci_source *get_gpe_table(size_t *num);
-
-#endif /* MAINBOARD_H */
diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index 175a321..84e40b0 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -15,7 +15,7 @@
 
 #include <AGESA.h>
 #include <FchPlatform.h>
-#include <mainboard.h>
+#include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
index 3b4da26..0a57808 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h
@@ -18,7 +18,9 @@
 #define __BASEBOARD_VARIANTS_H__
 
 #include <stddef.h>
+#include <soc/smi.h>
 
+const struct sci_source *get_gpe_table(size_t *num);
 size_t variant_board_id(void);
 
 #endif /* __BASEBOARD_VARIANTS_H__ */
diff --git a/src/mainboard/google/kahlee/variants/kahlee/gpio.c b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
index e25f1a1..3e981f5 100644
--- a/src/mainboard/google/kahlee/variants/kahlee/gpio.c
+++ b/src/mainboard/google/kahlee/variants/kahlee/gpio.c
@@ -15,7 +15,7 @@
 
 #include <AGESA.h>
 #include <FchPlatform.h>
-#include <mainboard.h>
+#include <baseboard/variants.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
 #include <stdlib.h>

-- 
To view, visit https://review.coreboot.org/22434
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7d50d5c949733d77c42b4daf56ed1f97ed6954
Gerrit-Change-Number: 22434
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171111/366121d8/attachment-0001.html>