From 659319250ead892d582231b68d27e7ee88c29c2f Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Thu, 15 Apr 2021 00:14:12 +0200
Subject: mb/google/zork: move include to the files where it's used

platform_descriptors.h is unrelated to the contents of baseboard/gpio.h
where it was included, so move the includes to the files where it is
actually needed.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I94e59b5aac2df834d956106ac953eebfc5cf6921
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52357
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c   | 1 +
 src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c | 1 +
 src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h  | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c
index 82ee672850..992d89661f 100644
--- a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_dalboz.c
@@ -2,6 +2,7 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
+#include <platform_descriptors.h>
 
 void __weak variant_get_dxio_ddi_descriptors(const fsp_dxio_descriptor **dxio_descs,
 					     size_t *dxio_num,
diff --git a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c
index 5492a0464b..ae36731c7b 100644
--- a/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/fsps_baseboard_trembyle.c
@@ -2,6 +2,7 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
+#include <platform_descriptors.h>
 #include <soc/soc_util.h>
 
 void __weak variant_get_dxio_ddi_descriptors(const fsp_dxio_descriptor **dxio_descs,
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
index f11f0b19d7..46f73767d1 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/gpio.h
@@ -6,7 +6,6 @@
 #ifndef __ACPI__
 #include <amdblocks/gpio_defs.h>
 #include <soc/gpio.h>
-#include <platform_descriptors.h>
 
 #if CONFIG(BOARD_GOOGLE_BASEBOARD_TREMBYLE)
 #define EC_IN_RW_OD		GPIO_130
-- 
cgit v1.2.3