Kyösti Mälkki has uploaded this change for review.
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>
---
M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
M src/soc/amd/common/block/gpio_banks/gpio.c
M src/soc/amd/common/block/include/amdblocks/gpio_banks.h
M src/soc/amd/picasso/acpi/sb_fch.asl
M src/soc/amd/stoneyridge/acpi/sb_fch.asl
5 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/37266/1
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 87890da..01942dc 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 17e3de0..76c2021 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 6427cb6..2206e35 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 680f496..ca8d175 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 e7975f8..897c9ec 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)
{
To view, visit change 37266. To unsubscribe, or for help writing mail filters, visit settings.