soc/amd/*: Explicitly include static.h for config_of_soc

As per commit 865173153760 ("sconfig: Move config_of_soc from device.h
to static.h"), sources that require access to the devicetree should
directly include static.h so that it can be removed from device.h,
eliminating unnecessary dependencies on static.h for files that only
need the types and function declarations in device.h.

Change-Id: I9db5d80ca0a75ccff3b8e24db0ccbd6b36c84dcb
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84587
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Varshit Pandya <pandyavarshit@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

33 files changed, 33 insertions, 0 deletions

diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c
index f60512d069..4481c46ae8 100644
--- a/src/soc/amd/cezanne/acpi.c
+++ b/src/soc/amd/cezanne/acpi.c
@@ -15,6 +15,7 @@
 #include <cpu/amd/cpuid.h>
 #include <device/device.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <types.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/cezanne/config.c b/src/soc/amd/cezanne/config.c
index 5db488cfa5..966b010e98 100644
--- a/src/soc/amd/cezanne/config.c
+++ b/src/soc/amd/cezanne/config.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/cezanne/fch.c b/src/soc/amd/cezanne/fch.c
index 1abe00dd1a..dfd2b8aba2 100644
--- a/src/soc/amd/cezanne/fch.c
+++ b/src/soc/amd/cezanne/fch.c
@@ -21,6 +21,7 @@
 #include <soc/platform_descriptors.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /*
diff --git a/src/soc/amd/cezanne/fsp_m_params.c b/src/soc/amd/cezanne/fsp_m_params.c
index f86be94f0d..5349a166f6 100644
--- a/src/soc/amd/cezanne/fsp_m_params.c
+++ b/src/soc/amd/cezanne/fsp_m_params.c
@@ -10,6 +10,7 @@
 #include <fsp/api.h>
 #include <soc/platform_descriptors.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <string.h>
 #include <types.h>
 #include <vendorcode/amd/fsp/cezanne/FspUsb.h>
diff --git a/src/soc/amd/cezanne/i2c.c b/src/soc/amd/cezanne/i2c.c
index 98e2413ee9..b8654eff95 100644
--- a/src/soc/amd/cezanne/i2c.c
+++ b/src/soc/amd/cezanne/i2c.c
@@ -4,6 +4,7 @@
 #include <console/console.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c
index 04fb90ca67..d9999b9163 100644
--- a/src/soc/amd/cezanne/root_complex.c
+++ b/src/soc/amd/cezanne/root_complex.c
@@ -9,6 +9,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <stdint.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/genoa_poc/config.c b/src/soc/amd/genoa_poc/config.c
index 895ba05e92..eab1ae44bc 100644
--- a/src/soc/amd/genoa_poc/config.c
+++ b/src/soc/amd/genoa_poc/config.c
@@ -3,6 +3,7 @@
 #include <device/device.h>
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/genoa_poc/i2c.c b/src/soc/amd/genoa_poc/i2c.c
index aac73f06eb..6436e3d190 100644
--- a/src/soc/amd/genoa_poc/i2c.c
+++ b/src/soc/amd/genoa_poc/i2c.c
@@ -3,6 +3,7 @@
 #include <amdblocks/i2c.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c
index eb1d4782a1..dbe610cb89 100644
--- a/src/soc/amd/glinda/acpi.c
+++ b/src/soc/amd/glinda/acpi.c
@@ -18,6 +18,7 @@
 #include <cpu/amd/cpuid.h>
 #include <device/device.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <types.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/glinda/config.c b/src/soc/amd/glinda/config.c
index 371cfebaa3..c57c49e07c 100644
--- a/src/soc/amd/glinda/config.c
+++ b/src/soc/amd/glinda/config.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/glinda/fch.c b/src/soc/amd/glinda/fch.c
index c11973884d..c4db328dd6 100644
--- a/src/soc/amd/glinda/fch.c
+++ b/src/soc/amd/glinda/fch.c
@@ -18,6 +18,7 @@
 #include <soc/i2c.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /*
diff --git a/src/soc/amd/glinda/fsp_m_params.c b/src/soc/amd/glinda/fsp_m_params.c
index 843a2d93a6..1d297d481d 100644
--- a/src/soc/amd/glinda/fsp_m_params.c
+++ b/src/soc/amd/glinda/fsp_m_params.c
@@ -13,6 +13,7 @@
 #include <fsp/api.h>
 #include <soc/platform_descriptors.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <string.h>
 #include <types.h>
 #include <vendorcode/amd/fsp/glinda/FspUsb.h>
diff --git a/src/soc/amd/glinda/i2c.c b/src/soc/amd/glinda/i2c.c
index bd3d4dc4f0..ab45ff5994 100644
--- a/src/soc/amd/glinda/i2c.c
+++ b/src/soc/amd/glinda/i2c.c
@@ -6,6 +6,7 @@
 #include <console/console.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c
index 776fc3279e..953e089ae7 100644
--- a/src/soc/amd/glinda/root_complex.c
+++ b/src/soc/amd/glinda/root_complex.c
@@ -11,6 +11,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <stdint.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c
index e7f0d96c64..9982d844ab 100644
--- a/src/soc/amd/mendocino/acpi.c
+++ b/src/soc/amd/mendocino/acpi.c
@@ -17,6 +17,7 @@
 #include <cpu/amd/cpuid.h>
 #include <device/device.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <types.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/mendocino/config.c b/src/soc/amd/mendocino/config.c
index 64a8b4b600..db3612bbce 100644
--- a/src/soc/amd/mendocino/config.c
+++ b/src/soc/amd/mendocino/config.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/mendocino/fch.c b/src/soc/amd/mendocino/fch.c
index 8fb0190396..57b513a557 100644
--- a/src/soc/amd/mendocino/fch.c
+++ b/src/soc/amd/mendocino/fch.c
@@ -16,6 +16,7 @@
 #include <soc/i2c.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /*
diff --git a/src/soc/amd/mendocino/fsp_m_params.c b/src/soc/amd/mendocino/fsp_m_params.c
index 6582a7cd50..8a7666999c 100644
--- a/src/soc/amd/mendocino/fsp_m_params.c
+++ b/src/soc/amd/mendocino/fsp_m_params.c
@@ -12,6 +12,7 @@
 #include <fsp/api.h>
 #include <soc/platform_descriptors.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <string.h>
 #include <types.h>
 #include <vendorcode/amd/fsp/mendocino/FspUsb.h>
diff --git a/src/soc/amd/mendocino/i2c.c b/src/soc/amd/mendocino/i2c.c
index 92e46b9020..92433a735d 100644
--- a/src/soc/amd/mendocino/i2c.c
+++ b/src/soc/amd/mendocino/i2c.c
@@ -4,6 +4,7 @@
 #include <console/console.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c
index a7cbe5131a..65ae5077d0 100644
--- a/src/soc/amd/mendocino/root_complex.c
+++ b/src/soc/amd/mendocino/root_complex.c
@@ -12,6 +12,7 @@
 #include <device/pci.h>
 #include <fsp/amd_misc_data.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <stdint.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c
index c6e06be0bb..a182dfbb12 100644
--- a/src/soc/amd/phoenix/acpi.c
+++ b/src/soc/amd/phoenix/acpi.c
@@ -18,6 +18,7 @@
 #include <cpu/amd/cpuid.h>
 #include <device/device.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <types.h>
 #include <vendorcode/amd/opensil/opensil.h>
 #include "chip.h"
diff --git a/src/soc/amd/phoenix/config.c b/src/soc/amd/phoenix/config.c
index b25298750a..664f09e3b9 100644
--- a/src/soc/amd/phoenix/config.c
+++ b/src/soc/amd/phoenix/config.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/phoenix/fch.c b/src/soc/amd/phoenix/fch.c
index 779d448682..52438e3821 100644
--- a/src/soc/amd/phoenix/fch.c
+++ b/src/soc/amd/phoenix/fch.c
@@ -16,6 +16,7 @@
 #include <soc/i2c.h>
 #include <soc/smi.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /*
diff --git a/src/soc/amd/phoenix/fsp_m_params.c b/src/soc/amd/phoenix/fsp_m_params.c
index 06c712733c..45a038e6fc 100644
--- a/src/soc/amd/phoenix/fsp_m_params.c
+++ b/src/soc/amd/phoenix/fsp_m_params.c
@@ -13,6 +13,7 @@
 #include <fsp/api.h>
 #include <soc/platform_descriptors.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <string.h>
 #include <types.h>
 #include <vendorcode/amd/fsp/phoenix/FspUsb.h>
diff --git a/src/soc/amd/phoenix/i2c.c b/src/soc/amd/phoenix/i2c.c
index 8237b7d776..e069c230d4 100644
--- a/src/soc/amd/phoenix/i2c.c
+++ b/src/soc/amd/phoenix/i2c.c
@@ -4,6 +4,7 @@
 #include <console/console.h>
 #include <soc/i2c.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/phoenix/root_complex.c b/src/soc/amd/phoenix/root_complex.c
index 7fed3bdb31..724121c1aa 100644
--- a/src/soc/amd/phoenix/root_complex.c
+++ b/src/soc/amd/phoenix/root_complex.c
@@ -11,6 +11,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <soc/iomap.h>
+#include <static.h>
 #include <stdint.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/picasso/config.c b/src/soc/amd/picasso/config.c
index 1836825ee3..ed8834d241 100644
--- a/src/soc/amd/picasso/config.c
+++ b/src/soc/amd/picasso/config.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/chip.h>
 #include <device/device.h>
+#include <static.h>
 #include "chip.h"
 
 const struct soc_amd_common_config *soc_get_common_config(void)
diff --git a/src/soc/amd/picasso/fch.c b/src/soc/amd/picasso/fch.c
index 8952c168d2..3550349158 100644
--- a/src/soc/amd/picasso/fch.c
+++ b/src/soc/amd/picasso/fch.c
@@ -21,6 +21,7 @@
 #include <soc/smi.h>
 #include <soc/amd_pci_int_defs.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 #include <types.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/picasso/fsp_m_params.c b/src/soc/amd/picasso/fsp_m_params.c
index 0be815e7f5..d1280fd032 100644
--- a/src/soc/amd/picasso/fsp_m_params.c
+++ b/src/soc/amd/picasso/fsp_m_params.c
@@ -8,6 +8,7 @@
 #include <soc/platform_descriptors.h>
 #include <soc/pci_devs.h>
 #include <soc/fsp.h>
+#include <static.h>
 #include <types.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/picasso/fsp_s_params.c b/src/soc/amd/picasso/fsp_s_params.c
index c35612dd59..9f491d6516 100644
--- a/src/soc/amd/picasso/fsp_s_params.c
+++ b/src/soc/amd/picasso/fsp_s_params.c
@@ -7,6 +7,7 @@
 #include <soc/pci_devs.h>
 #include <soc/platform_descriptors.h>
 #include <soc/soc_util.h>
+#include <static.h>
 #include <fsp/api.h>
 #include "chip.h"
 
diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c
index d71843658b..bcebbc31c3 100644
--- a/src/soc/amd/picasso/i2c.c
+++ b/src/soc/amd/picasso/i2c.c
@@ -7,6 +7,7 @@
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
+#include <static.h>
 #include "chip.h"
 
 /* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index a3bd729ce0..aa75f0b8c2 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -8,6 +8,7 @@
 #include <arch/ioapic.h>
 #include <device/device.h>
 #include <device/pci.h>
+#include <static.h>
 #include <stdint.h>
 #include <soc/iomap.h>
 #include "chip.h"
diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index f7adbecadf..6074fc75b9 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -4,6 +4,7 @@
 #include <amdblocks/i2c.h>
 #include <soc/iomap.h>
 #include <soc/i2c.h>
+#include <static.h>
 #include "chip.h"
 #include <drivers/i2c/designware/dw_i2c.h>