Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/84678?usp=email )
Change subject: mb/google/*: Explicitly include static.h for DEV_PTR ......................................................................
mb/google/*: Explicitly include static.h for DEV_PTR
As per commit 05a13e7ed9b9 ("sconfig: Move (WEAK_)DEV_PTR from device.h to static.h"), sources that require access to devicetree static devices should directly include static.h. This allows static.h to be removed from device.h, eliminating unnecessary dependencies on the devicetree for objects that only need the device types and function declarations.
The DEV_PTR macro resolves to names declared in static_devices.h, which is then included in static.h, so include the header whenever the macro is used.
Change-Id: I05662e601af00866b7f26f4c6c6794b491bf676e Signed-off-by: Nicholas Chin nic.c3.14@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/84678 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Jayvik Desai jayvik@google.com Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/brox/variants/brox/fw_config.c M src/mainboard/google/brox/variants/brox/ramstage.c M src/mainboard/google/brya/mainboard.c M src/mainboard/google/brya/variants/agah/variant.c M src/mainboard/google/brya/variants/aurash/ramstage.c M src/mainboard/google/brya/variants/craask/variant.c M src/mainboard/google/brya/variants/craaskov/variant.c M src/mainboard/google/brya/variants/hades/variant.c M src/mainboard/google/brya/variants/joxer/variant.c M src/mainboard/google/brya/variants/kinox/ramstage.c M src/mainboard/google/brya/variants/moli/ramstage.c M src/mainboard/google/brya/variants/primus/variant.c M src/mainboard/google/brya/variants/quandiso/variant.c M src/mainboard/google/brya/variants/vell/variant.c M src/mainboard/google/brya/variants/yaviks/variant.c M src/mainboard/google/brya/variants/yavilla/variant.c M src/mainboard/google/guybrush/mainboard.c M src/mainboard/google/guybrush/port_descriptors.c M src/mainboard/google/guybrush/variants/guybrush/variant.c M src/mainboard/google/guybrush/variants/nipperkin/ramstage.c M src/mainboard/google/hatch/variants/jinlon/mainboard.c M src/mainboard/google/rex/mainboard.c M src/mainboard/google/skyrim/mainboard.c M src/mainboard/google/volteer/mainboard.c M src/mainboard/google/volteer/variants/collis/variant.c M src/mainboard/google/volteer/variants/copano/variant.c M src/mainboard/google/volteer/variants/delbin/variant.c M src/mainboard/google/volteer/variants/drobit/variant.c M src/mainboard/google/volteer/variants/volteer2/variant.c M src/mainboard/google/zork/variants/berknip/variant.c M src/mainboard/google/zork/variants/ezkinil/variant.c M src/mainboard/google/zork/variants/morphius/variant.c 32 files changed, 32 insertions(+), 0 deletions(-)
Approvals: Felix Singer: Looks good to me, approved build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Jayvik Desai: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/brox/variants/brox/fw_config.c b/src/mainboard/google/brox/variants/brox/fw_config.c index 8599706..28afd3a 100644 --- a/src/mainboard/google/brox/variants/brox/fw_config.c +++ b/src/mainboard/google/brox/variants/brox/fw_config.c @@ -4,6 +4,7 @@ #include <drivers/intel/ish/chip.h> #include <fw_config.h> #include <gpio.h> +#include <static.h>
#define ISH_FIRMWARE_NAME "brox_ish.bin"
diff --git a/src/mainboard/google/brox/variants/brox/ramstage.c b/src/mainboard/google/brox/variants/brox/ramstage.c index aef7a00..83d7996 100644 --- a/src/mainboard/google/brox/variants/brox/ramstage.c +++ b/src/mainboard/google/brox/variants/brox/ramstage.c @@ -5,6 +5,7 @@ #include <device/pci_ids.h> #include <ec/google/chromeec/ec.h> #include <intelblocks/power_limit.h> +#include <static.h>
/* * SKU_ID, TDP (Watts), pl1_min (milliWatts), pl1_max (milliWatts), diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c index 07aa4b5..3d33f6f 100644 --- a/src/mainboard/google/brya/mainboard.c +++ b/src/mainboard/google/brya/mainboard.c @@ -11,6 +11,7 @@ #include <security/tpm/tss.h> #include <soc/gpio.h> #include <soc/ramstage.h> +#include <static.h> #include <stdio.h>
WEAK_DEV_PTR(rp6_wwan); diff --git a/src/mainboard/google/brya/variants/agah/variant.c b/src/mainboard/google/brya/variants/agah/variant.c index 9acee54..0372033 100644 --- a/src/mainboard/google/brya/variants/agah/variant.c +++ b/src/mainboard/google/brya/variants/agah/variant.c @@ -7,6 +7,7 @@ #include <delay.h> #include <device/pci.h> #include <gpio.h> +#include <static.h> #include <timer.h> #include <types.h>
diff --git a/src/mainboard/google/brya/variants/aurash/ramstage.c b/src/mainboard/google/brya/variants/aurash/ramstage.c index 700d173..b8845d9 100644 --- a/src/mainboard/google/brya/variants/aurash/ramstage.c +++ b/src/mainboard/google/brya/variants/aurash/ramstage.c @@ -11,6 +11,7 @@ #include <fw_config.h> #include <intelblocks/power_limit.h> #include <drivers/intel/dptf/chip.h> +#include <static.h>
const struct cpu_power_limits limits[] = { /* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */ diff --git a/src/mainboard/google/brya/variants/craask/variant.c b/src/mainboard/google/brya/variants/craask/variant.c index 24d7e00..5f6076e 100644 --- a/src/mainboard/google/brya/variants/craask/variant.c +++ b/src/mainboard/google/brya/variants/craask/variant.c @@ -5,6 +5,7 @@ #include <device/device.h> #include <fw_config.h> #include <sar.h> +#include <static.h>
const char *get_wifi_sar_cbfs_filename(void) { diff --git a/src/mainboard/google/brya/variants/craaskov/variant.c b/src/mainboard/google/brya/variants/craaskov/variant.c index 4a06f10..406d604 100644 --- a/src/mainboard/google/brya/variants/craaskov/variant.c +++ b/src/mainboard/google/brya/variants/craaskov/variant.c @@ -5,6 +5,7 @@ #include <device/device.h> #include <fw_config.h> #include <sar.h> +#include <static.h>
const char *get_wifi_sar_cbfs_filename(void) { diff --git a/src/mainboard/google/brya/variants/hades/variant.c b/src/mainboard/google/brya/variants/hades/variant.c index 48e2652..7a258fb 100644 --- a/src/mainboard/google/brya/variants/hades/variant.c +++ b/src/mainboard/google/brya/variants/hades/variant.c @@ -7,6 +7,7 @@ #include <delay.h> #include <device/pci.h> #include <gpio.h> +#include <static.h> #include <timer.h> #include <types.h>
diff --git a/src/mainboard/google/brya/variants/joxer/variant.c b/src/mainboard/google/brya/variants/joxer/variant.c index e371ada..1f2ea9f 100644 --- a/src/mainboard/google/brya/variants/joxer/variant.c +++ b/src/mainboard/google/brya/variants/joxer/variant.c @@ -8,6 +8,7 @@ #include <fw_config.h> #include <soc/bootblock.h> #include <sar.h> +#include <static.h>
WEAK_DEV_PTR(dptf_policy);
diff --git a/src/mainboard/google/brya/variants/kinox/ramstage.c b/src/mainboard/google/brya/variants/kinox/ramstage.c index 3063c62..c343c04 100644 --- a/src/mainboard/google/brya/variants/kinox/ramstage.c +++ b/src/mainboard/google/brya/variants/kinox/ramstage.c @@ -9,6 +9,7 @@ #include <drivers/intel/dptf/chip.h> #include <ec/google/chromeec/ec.h> #include <intelblocks/power_limit.h> +#include <static.h>
WEAK_DEV_PTR(dptf_policy);
diff --git a/src/mainboard/google/brya/variants/moli/ramstage.c b/src/mainboard/google/brya/variants/moli/ramstage.c index 2be75e4..af26697 100644 --- a/src/mainboard/google/brya/variants/moli/ramstage.c +++ b/src/mainboard/google/brya/variants/moli/ramstage.c @@ -13,6 +13,7 @@ #include <drivers/intel/dptf/chip.h> #include <boardid.h> #include <soc/intel/common/block/pcie/rtd3/chip.h> +#include <static.h> #include <acpi/acpi_device.h>
static void devtree_update_emmc_rtd3(void) diff --git a/src/mainboard/google/brya/variants/primus/variant.c b/src/mainboard/google/brya/variants/primus/variant.c index e78dfdc..c1ea39e 100644 --- a/src/mainboard/google/brya/variants/primus/variant.c +++ b/src/mainboard/google/brya/variants/primus/variant.c @@ -6,6 +6,7 @@ #include <drivers/i2c/hid/chip.h> #include <fw_config.h> #include <gpio.h> +#include <static.h>
static void devtree_update_emmc_rtd3(uint32_t board_ver) { diff --git a/src/mainboard/google/brya/variants/quandiso/variant.c b/src/mainboard/google/brya/variants/quandiso/variant.c index 9140eb0..4f6ebb8 100644 --- a/src/mainboard/google/brya/variants/quandiso/variant.c +++ b/src/mainboard/google/brya/variants/quandiso/variant.c @@ -5,6 +5,7 @@ #include <device/device.h> #include <fw_config.h> #include <sar.h> +#include <static.h>
void variant_devtree_update(void) { diff --git a/src/mainboard/google/brya/variants/vell/variant.c b/src/mainboard/google/brya/variants/vell/variant.c index 216de3c9..ce75438 100644 --- a/src/mainboard/google/brya/variants/vell/variant.c +++ b/src/mainboard/google/brya/variants/vell/variant.c @@ -4,6 +4,7 @@ #include <boardid.h> #include <sar.h> #include <soc/pci_devs.h> +#include <static.h>
const char *get_wifi_sar_cbfs_filename(void) { diff --git a/src/mainboard/google/brya/variants/yaviks/variant.c b/src/mainboard/google/brya/variants/yaviks/variant.c index 5c0c9ff..97691f7 100644 --- a/src/mainboard/google/brya/variants/yaviks/variant.c +++ b/src/mainboard/google/brya/variants/yaviks/variant.c @@ -7,6 +7,7 @@ #include <drivers/intel/gma/opregion.h> #include <fw_config.h> #include <sar.h> +#include <static.h>
const char *get_wifi_sar_cbfs_filename(void) { diff --git a/src/mainboard/google/brya/variants/yavilla/variant.c b/src/mainboard/google/brya/variants/yavilla/variant.c index 9140eb0..4f6ebb8 100644 --- a/src/mainboard/google/brya/variants/yavilla/variant.c +++ b/src/mainboard/google/brya/variants/yavilla/variant.c @@ -5,6 +5,7 @@ #include <device/device.h> #include <fw_config.h> #include <sar.h> +#include <static.h>
void variant_devtree_update(void) { diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c index 49a80e7..b803450 100644 --- a/src/mainboard/google/guybrush/mainboard.c +++ b/src/mainboard/google/guybrush/mainboard.c @@ -12,6 +12,7 @@ #include <device/device.h> #include <drivers/i2c/tpm/chip.h> #include <gpio.h> +#include <static.h> #include <variant/ec.h>
#define BACKLIGHT_GPIO GPIO_129 diff --git a/src/mainboard/google/guybrush/port_descriptors.c b/src/mainboard/google/guybrush/port_descriptors.c index a056a19..8d09985 100644 --- a/src/mainboard/google/guybrush/port_descriptors.c +++ b/src/mainboard/google/guybrush/port_descriptors.c @@ -5,6 +5,7 @@ #include <device/pci_def.h> #include <gpio.h> #include <soc/platform_descriptors.h> +#include <static.h> #include <types.h>
/* All PCIe Resets are handled in coreboot */ diff --git a/src/mainboard/google/guybrush/variants/guybrush/variant.c b/src/mainboard/google/guybrush/variants/guybrush/variant.c index 394270c..ea39b66 100644 --- a/src/mainboard/google/guybrush/variants/guybrush/variant.c +++ b/src/mainboard/google/guybrush/variants/guybrush/variant.c @@ -5,6 +5,7 @@ #include <device/device.h> #include <amdblocks/cpu.h> #include <gpio.h> +#include <static.h>
bool variant_has_pcie_wwan(void) { diff --git a/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c b/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c index 247c132..613b78a 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c +++ b/src/mainboard/google/guybrush/variants/nipperkin/ramstage.c @@ -6,6 +6,7 @@ #include <drivers/i2c/tpm/chip.h> #include <drivers/uart/acpi/chip.h> #include <gpio.h> +#include <static.h>
static void cr50_devtree_update(void) { diff --git a/src/mainboard/google/hatch/variants/jinlon/mainboard.c b/src/mainboard/google/hatch/variants/jinlon/mainboard.c index 009a6ad..60a7b76 100644 --- a/src/mainboard/google/hatch/variants/jinlon/mainboard.c +++ b/src/mainboard/google/hatch/variants/jinlon/mainboard.c @@ -4,6 +4,7 @@ #include <console/console.h> #include <ec/google/chromeec/ec.h> #include <device/device.h> +#include <static.h> #include <variant/sku.h>
static bool eps_sku(uint32_t sku_id) diff --git a/src/mainboard/google/rex/mainboard.c b/src/mainboard/google/rex/mainboard.c index 9157abb..66e1e69 100644 --- a/src/mainboard/google/rex/mainboard.c +++ b/src/mainboard/google/rex/mainboard.c @@ -9,6 +9,7 @@ #include <ec/ec.h> #include <fw_config.h> #include <soc/ramstage.h> +#include <static.h> #include <stdio.h> #include <stdlib.h> #include <vendorcode/google/chromeos/chromeos.h> diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c index 5925f29..ebd373a 100644 --- a/src/mainboard/google/skyrim/mainboard.c +++ b/src/mainboard/google/skyrim/mainboard.c @@ -9,6 +9,7 @@ #include <cpu/x86/smm.h> #include <device/device.h> #include <drivers/i2c/tpm/chip.h> +#include <static.h> #include <variant/ec.h>
/* The IRQ mapping in fch_irq_map ends up getting written to the indirect address space that is diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index ae7519e..4d62ed6 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -12,6 +12,7 @@ #include <intelblocks/tcss.h> #include <soc/pci_devs.h> #include <soc/ramstage.h> +#include <static.h> #include <stdio.h> #include <variant/gpio.h> #include <vb2_api.h> diff --git a/src/mainboard/google/volteer/variants/collis/variant.c b/src/mainboard/google/volteer/variants/collis/variant.c index cdb165d..a7f7a38 100644 --- a/src/mainboard/google/volteer/variants/collis/variant.c +++ b/src/mainboard/google/volteer/variants/collis/variant.c @@ -4,6 +4,7 @@ #include <fw_config.h> #include <drivers/i2c/hid/chip.h> #include <device/device.h> +#include <static.h>
static void audio_codec_update(void) { diff --git a/src/mainboard/google/volteer/variants/copano/variant.c b/src/mainboard/google/volteer/variants/copano/variant.c index cdb165d..a7f7a38 100644 --- a/src/mainboard/google/volteer/variants/copano/variant.c +++ b/src/mainboard/google/volteer/variants/copano/variant.c @@ -4,6 +4,7 @@ #include <fw_config.h> #include <drivers/i2c/hid/chip.h> #include <device/device.h> +#include <static.h>
static void audio_codec_update(void) { diff --git a/src/mainboard/google/volteer/variants/delbin/variant.c b/src/mainboard/google/volteer/variants/delbin/variant.c index cdb165d..a7f7a38 100644 --- a/src/mainboard/google/volteer/variants/delbin/variant.c +++ b/src/mainboard/google/volteer/variants/delbin/variant.c @@ -4,6 +4,7 @@ #include <fw_config.h> #include <drivers/i2c/hid/chip.h> #include <device/device.h> +#include <static.h>
static void audio_codec_update(void) { diff --git a/src/mainboard/google/volteer/variants/drobit/variant.c b/src/mainboard/google/volteer/variants/drobit/variant.c index cdb165d..a7f7a38 100644 --- a/src/mainboard/google/volteer/variants/drobit/variant.c +++ b/src/mainboard/google/volteer/variants/drobit/variant.c @@ -4,6 +4,7 @@ #include <fw_config.h> #include <drivers/i2c/hid/chip.h> #include <device/device.h> +#include <static.h>
static void audio_codec_update(void) { diff --git a/src/mainboard/google/volteer/variants/volteer2/variant.c b/src/mainboard/google/volteer/variants/volteer2/variant.c index c9129b2..f3c21cb 100644 --- a/src/mainboard/google/volteer/variants/volteer2/variant.c +++ b/src/mainboard/google/volteer/variants/volteer2/variant.c @@ -3,6 +3,7 @@ #include <baseboard/variants.h> #include <soc/pci_devs.h> #include <acpi/acpi_device.h> +#include <static.h>
/* * This function runs only on the volteer_ti50 variant, which has the GSC on a diff --git a/src/mainboard/google/zork/variants/berknip/variant.c b/src/mainboard/google/zork/variants/berknip/variant.c index 1810a66..1b35c5c 100644 --- a/src/mainboard/google/zork/variants/berknip/variant.c +++ b/src/mainboard/google/zork/variants/berknip/variant.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <baseboard/variants.h> +#include <static.h>
void variant_devtree_update(void) { diff --git a/src/mainboard/google/zork/variants/ezkinil/variant.c b/src/mainboard/google/zork/variants/ezkinil/variant.c index 142aa21..7e61690 100644 --- a/src/mainboard/google/zork/variants/ezkinil/variant.c +++ b/src/mainboard/google/zork/variants/ezkinil/variant.c @@ -4,6 +4,7 @@ #include <device/device.h> #include <soc/pci_devs.h> #include <ec/google/chromeec/ec.h> +#include <static.h>
void variant_devtree_update(void) { diff --git a/src/mainboard/google/zork/variants/morphius/variant.c b/src/mainboard/google/zork/variants/morphius/variant.c index 864d73b..b5ee902 100644 --- a/src/mainboard/google/zork/variants/morphius/variant.c +++ b/src/mainboard/google/zork/variants/morphius/variant.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <baseboard/variants.h> +#include <static.h>
#define MORPHIUS_SKU_1 0x5A010010 #define MORPHIUS_SKU_2 0x5A010011
-
Felix Singer (Code Review)