summaryrefslogtreecommitdiff
path: root/src/mainboard/google/jecht
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-05-12 13:44:22 +0200
committerNico Huber <nico.h@gmx.de>2019-05-14 23:22:02 +0000
commitcadc70f7974db25144381b3ea26d4b660233f4dd (patch)
treede9e0677c328fe3d90389298c00f8831d0a6984d /src/mainboard/google/jecht
parent57459dbeacb4759c3352206464b6c19b7add00d5 (diff)
downloadcoreboot-cadc70f7974db25144381b3ea26d4b660233f4dd.tar.xz
soc/intel/broadwell: Move GPIO init to a common place
This also links the gpio configuration instead of including it as a header. Change-Id: I9309d2b842495f6cff33fdab18aa139a82c1959c Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32759 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Diffstat (limited to 'src/mainboard/google/jecht')
-rw-r--r--src/mainboard/google/jecht/Makefile.inc2
-rw-r--r--src/mainboard/google/jecht/romstage.c5
-rw-r--r--src/mainboard/google/jecht/variants/guado/gpio.c (renamed from src/mainboard/google/jecht/variants/guado/include/variant/gpio.h)7
-rw-r--r--src/mainboard/google/jecht/variants/jecht/gpio.c (renamed from src/mainboard/google/jecht/variants/jecht/include/variant/gpio.h)7
-rw-r--r--src/mainboard/google/jecht/variants/rikku/gpio.c (renamed from src/mainboard/google/jecht/variants/rikku/include/variant/gpio.h)7
-rw-r--r--src/mainboard/google/jecht/variants/tidus/gpio.c (renamed from src/mainboard/google/jecht/variants/tidus/include/variant/gpio.h)7
6 files changed, 6 insertions, 29 deletions
diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.inc
index 01914bae7d..39e9b339e8 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.inc
@@ -27,3 +27,5 @@ romstage-y += led.c
subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
+
+romstage-y += variants/$(VARIANT_DIR)/gpio.c
diff --git a/src/mainboard/google/jecht/romstage.c b/src/mainboard/google/jecht/romstage.c
index 3705feb28a..de0ed30575 100644
--- a/src/mainboard/google/jecht/romstage.c
+++ b/src/mainboard/google/jecht/romstage.c
@@ -18,14 +18,12 @@
#include <console/console.h>
#include <string.h>
#include <ec/google/chromeec/ec.h>
-#include <soc/gpio.h>
#include <soc/pei_data.h>
#include <soc/pei_wrapper.h>
#include <soc/romstage.h>
#include <superio/ite/common/ite.h>
#include <superio/ite/it8772f/it8772f.h>
#include <mainboard/google/jecht/spd/spd.h>
-#include <variant/gpio.h>
#include "onboard.h"
@@ -35,9 +33,6 @@ void mainboard_romstage_entry(struct romstage_params *rp)
post_code(0x32);
- /* Initialize GPIOs */
- init_gpios(mainboard_gpio_config);
-
/* Fill out PEI DATA */
memset(&pei_data, 0, sizeof(pei_data));
mainboard_fill_pei_data(&pei_data);
diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/gpio.h b/src/mainboard/google/jecht/variants/guado/gpio.c
index 4c167e3a58..60e769dbd0 100644
--- a/src/mainboard/google/jecht/variants/guado/include/variant/gpio.h
+++ b/src/mainboard/google/jecht/variants/guado/gpio.c
@@ -13,12 +13,9 @@
* GNU General Public License for more details.
*/
-#ifndef GUADO_GPIO_H
-#define GUADO_GPIO_H
-
#include <soc/gpio.h>
-static const struct gpio_config mainboard_gpio_config[] = {
+const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 0: UNUSED */
PCH_GPIO_UNUSED, /* 1: UNUSED */
PCH_GPIO_UNUSED, /* 2: UNUSED */
@@ -116,5 +113,3 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 94: UNUSED */
PCH_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/gpio.h b/src/mainboard/google/jecht/variants/jecht/gpio.c
index 94e6516ce7..6a2a64cd7b 100644
--- a/src/mainboard/google/jecht/variants/jecht/include/variant/gpio.h
+++ b/src/mainboard/google/jecht/variants/jecht/gpio.c
@@ -13,12 +13,9 @@
* GNU General Public License for more details.
*/
-#ifndef JECHT_GPIO_H
-#define JECHT_GPIO_H
-
#include <soc/gpio.h>
-static const struct gpio_config mainboard_gpio_config[] = {
+const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 0: UNUSED */
PCH_GPIO_UNUSED, /* 1: UNUSED */
PCH_GPIO_UNUSED, /* 2: UNUSED */
@@ -116,5 +113,3 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 94: UNUSED */
PCH_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/gpio.h b/src/mainboard/google/jecht/variants/rikku/gpio.c
index f58ad24f67..bc065a03a1 100644
--- a/src/mainboard/google/jecht/variants/rikku/include/variant/gpio.h
+++ b/src/mainboard/google/jecht/variants/rikku/gpio.c
@@ -13,12 +13,9 @@
* GNU General Public License for more details.
*/
-#ifndef RIKKU_GPIO_H
-#define RIKKU_GPIO_H
-
#include <soc/gpio.h>
-static const struct gpio_config mainboard_gpio_config[] = {
+const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 0: UNUSED */
PCH_GPIO_UNUSED, /* 1: UNUSED */
PCH_GPIO_UNUSED, /* 2: UNUSED */
@@ -116,5 +113,3 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 94: UNUSED */
PCH_GPIO_END
};
-
-#endif
diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/gpio.h b/src/mainboard/google/jecht/variants/tidus/gpio.c
index 846fe816d4..78aa177679 100644
--- a/src/mainboard/google/jecht/variants/tidus/include/variant/gpio.h
+++ b/src/mainboard/google/jecht/variants/tidus/gpio.c
@@ -13,12 +13,9 @@
* GNU General Public License for more details.
*/
-#ifndef TIDUS_GPIO_H
-#define TIDUS_GPIO_H
-
#include <soc/gpio.h>
-static const struct gpio_config mainboard_gpio_config[] = {
+const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 0: UNUSED */
PCH_GPIO_UNUSED, /* 1: UNUSED */
PCH_GPIO_UNUSED, /* 2: UNUSED */
@@ -116,5 +113,3 @@ static const struct gpio_config mainboard_gpio_config[] = {
PCH_GPIO_UNUSED, /* 94: UNUSED */
PCH_GPIO_END
};
-
-#endif