From c9eae795d1595e37fcb955b5d4c923d59ba5f210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 27 Nov 2019 07:45:27 +0200
Subject: [PATCH] soc/amd/common: Fix indirect includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Builds that would otherwise be reproducible are sometimes
broken due to added #include combined with __LINE__ used
in assert() statement.

Change-Id: If4a02393799a34bbae4f6e506052774526c1a969
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37266
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../kahlee/variants/baseboard/include/baseboard/acpi/audio.asl | 3 ++-
 src/soc/amd/common/block/gpio_banks/gpio.c                     | 1 +
 src/soc/amd/common/block/include/amdblocks/gpio_banks.h        | 1 +
 src/soc/amd/picasso/acpi/sb_fch.asl                            | 1 +
 src/soc/amd/stoneyridge/acpi/sb_fch.asl                        | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
index 87890daf36..01942dcbd3 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
@@ -12,7 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <soc/iomap.h>
+
+#include <amdblocks/acpimmio_map.h>
 
 /* Grunt specific I2S machine driver */
 Device (I2S)
diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio_banks/gpio.c
index 17e3de09e3..76c2021578 100644
--- a/src/soc/amd/common/block/gpio_banks/gpio.c
+++ b/src/soc/amd/common/block/gpio_banks/gpio.c
@@ -20,6 +20,7 @@
 #include <console/console.h>
 #include <gpio.h>
 #include <amdblocks/acpimmio.h>
+#include <amdblocks/acpimmio_map.h>
 #include <soc/gpio.h>
 #include <soc/smi.h>
 #include <assert.h>
diff --git a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
index 6427cb696e..2206e35ff2 100644
--- a/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
+++ b/src/soc/amd/common/block/include/amdblocks/gpio_banks.h
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <amdblocks/acpimmio_map.h>
 
 struct soc_amd_gpio {
 	uint8_t gpio;
diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index 680f496611..ca8d175c61 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -15,6 +15,7 @@
 
 #include <soc/gpio.h>
 #include <soc/iomap.h>
+#include <amdblocks/acpimmio_map.h>
 
 Device (AAHB)
 {
diff --git a/src/soc/amd/stoneyridge/acpi/sb_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_fch.asl
index e7975f8d94..897c9ec905 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_fch.asl
@@ -15,6 +15,7 @@
 
 #include <soc/gpio.h>
 #include <soc/iomap.h>
+#include <amdblocks/acpimmio_map.h>
 
 Device (AAHB)
 {