summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-27 07:45:27 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-28 10:53:19 +0000
commitc9eae795d1595e37fcb955b5d4c923d59ba5f210 (patch)
treecdcd4abf6f08071d8662a4e9f4fd7e3b6fe6761e
parent9f5c895ec7761f376724332cb61b9222562835e1 (diff)
downloadcoreboot-c9eae795d1595e37fcb955b5d4c923d59ba5f210.tar.xz
soc/amd/common: Fix indirect includes
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>
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl3
-rw-r--r--src/soc/amd/common/block/gpio_banks/gpio.c1
-rw-r--r--src/soc/amd/common/block/include/amdblocks/gpio_banks.h1
-rw-r--r--src/soc/amd/picasso/acpi/sb_fch.asl1
-rw-r--r--src/soc/amd/stoneyridge/acpi/sb_fch.asl1
5 files changed, 6 insertions, 1 deletions
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)
{