From 05765c8951f34e53d92680d5e74062cbffa692d8 Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sun, 29 Sep 2024 21:16:18 -0600
Subject: [PATCH] tree: Include static.h for remaining devicetree usages

As per commit 865173153760 ("sconfig: Move config_of_soc from device.h
to static.h") and commit 05a13e7ed9b9 ("sconfig: Move (WEAK_)DEV_PTR
from device.h to static.h"), sources that use code generated from the
devicetree should directly include static.h. This allows static.h to be
removed from device.h, eliminating many unnecessary dependencies on the
devicetree for objects that only need the device types and function
declarations.

Add static.h to the includes of all remaining files that require static
devicetree access through config_of_soc(), the sconfig generated names,
or DEV_PTR().

Change-Id: I1d35ff2ac22f9ff5e0aa38b7ad707619e50387f3
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84591
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/cpu/intel/model_206ax/model_206ax_init.c              | 1 +
 src/mainboard/starlabs/starfighter/variants/rpl/devtree.c | 1 +
 src/northbridge/amd/pi/00730F01/northbridge.c             | 1 +
 src/soc/intel/common/block/systemagent/systemagent.c      | 1 +
 src/southbridge/intel/i82801ix/lpc.c                      | 1 +
 src/southbridge/intel/i82801jx/lpc.c                      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 4fa8cef5d4..23310a303b 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -18,6 +18,7 @@
 #include <cpu/intel/common/common.h>
 #include <smbios.h>
 #include <smp/node.h>
+#include <static.h>
 #include <types.h>
 
 /* Convert time in seconds to POWER_LIMIT_1_TIME MSR value */
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
index 5d2b8f6973..9d4bb69245 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
@@ -5,6 +5,7 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <option.h>
+#include <static.h>
 #include <types.h>
 #include <variants.h>
 
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 1be9421c72..55074435ab 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -11,6 +11,7 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <static.h>
 #include <string.h>
 #include <stdlib.h>
 #include <cpu/x86/mp.h>
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index b35820234e..098c3c4385 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -15,6 +15,7 @@
 #include <soc/nvs.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
+#include <static.h>
 #include <types.h>
 #include "systemagent_def.h"
 
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 0adc1b90c0..9c26e2c6d5 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -21,6 +21,7 @@
 #include <southbridge/intel/common/pmutil.h>
 #include <southbridge/intel/common/acpi_pirq_gen.h>
 #include <southbridge/intel/common/rcba_pirq.h>
+#include <static.h>
 
 #define NMI_OFF	0
 
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 0a3e26f278..a955dfe8e5 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -22,6 +22,7 @@
 #include <southbridge/intel/common/pmutil.h>
 #include <southbridge/intel/common/acpi_pirq_gen.h>
 #include <southbridge/intel/common/rcba_pirq.h>
+#include <static.h>
 
 #define NMI_OFF	0
 
-- 
2.11.4.GIT