Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35657 )
Change subject: soc/intel: Rename <intelblocks/chip.h> ......................................................................
soc/intel: Rename <intelblocks/chip.h>
The filename chip.h has a special purpose with the generation of static devicetree, where the configuration structure name matches the path to the chip.h file. For example, soc/intel/skylake/chip.h defines struct soc_intel_skylake_config.
The renamed file did not follow this convention and the structure it defines would conflict with one defined soc/intel/common/chip.h if such is ever added.
Change-Id: Id3d56bf092c6111d2293136865b053b095e92d6b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/apollolake/chip.c M src/soc/intel/apollolake/chip.h M src/soc/intel/cannonlake/chip.c M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/lockdown.c M src/soc/intel/cannonlake/romstage/romstage.c M src/soc/intel/common/block/cpu/mp_init.c M src/soc/intel/common/block/gspi/gspi.c M src/soc/intel/common/block/i2c/i2c.c R src/soc/intel/common/block/include/intelblocks/cfg.h M src/soc/intel/common/block/scs/mmc.c M src/soc/intel/common/block/thermal/thermal.c M src/soc/intel/common/pch/lockdown/lockdown.c M src/soc/intel/icelake/chip.c M src/soc/intel/icelake/chip.h M src/soc/intel/icelake/lockdown.c M src/soc/intel/icelake/romstage/romstage.c M src/soc/intel/skylake/chip.c M src/soc/intel/skylake/chip.h M src/soc/intel/skylake/chip_fsp20.c M src/soc/intel/skylake/i2c.c M src/soc/intel/skylake/lockdown.c 22 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/35657/1
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index ddbe734..8e516f8 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -28,7 +28,7 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/fast_spi.h> #include <intelblocks/msr.h> #include <intelblocks/p2sb.h> diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index b9e368c..85cfff9 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -20,7 +20,7 @@ #define _SOC_APOLLOLAKE_CHIP_H_
#include <commonlib/helpers.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <soc/gpe.h> #include <soc/gpio.h> diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 47e01a4..0ce2f1a 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -18,7 +18,7 @@ #include <fsp/api.h> #include <fsp/util.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/xdci.h> #include <romstage_handoff.h> diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 451c920..b937699 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -18,7 +18,7 @@ #ifndef _SOC_CHIP_H_ #define _SOC_CHIP_H_
-#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gpio.h> #include <intelblocks/gspi.h> diff --git a/src/soc/intel/cannonlake/lockdown.c b/src/soc/intel/cannonlake/lockdown.c index e2fcc3a..ba68aa3 100644 --- a/src/soc/intel/cannonlake/lockdown.c +++ b/src/soc/intel/cannonlake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelpch/lockdown.h> #include <soc/pm.h>
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index ba583b9..f782f63 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -17,7 +17,7 @@ #include <cbmem.h> #include <console/console.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> #include <memory_info.h> diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index e0cee17..2c5061f 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -21,7 +21,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mp.h> #include <cpu/intel/microcode.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cpulib.h> #include <intelblocks/fast_spi.h> #include <intelblocks/mp_init.h> diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c index f937bd6..33f376e 100644 --- a/src/soc/intel/common/block/gspi/gspi.c +++ b/src/soc/intel/common/block/gspi/gspi.c @@ -21,7 +21,7 @@ #include <device/device.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <intelblocks/lpss.h> #include <intelblocks/spi.h> diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 854a61a..fb7aea2 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -21,7 +21,7 @@ #include <device/pci_def.h> #include <device/pci_ids.h> #include <drivers/i2c/designware/dw_i2c.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/lpss.h> #include <soc/iomap.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/common/block/include/intelblocks/chip.h b/src/soc/intel/common/block/include/intelblocks/cfg.h similarity index 92% rename from src/soc/intel/common/block/include/intelblocks/chip.h rename to src/soc/intel/common/block/include/intelblocks/cfg.h index 1e830d5..e7e381b 100644 --- a/src/soc/intel/common/block/include/intelblocks/chip.h +++ b/src/soc/intel/common/block/include/intelblocks/cfg.h @@ -13,8 +13,8 @@ * GNU General Public License for more details. */
-#ifndef SOC_INTEL_COMMON_BLOCK_CHIP_H -#define SOC_INTEL_COMMON_BLOCK_CHIP_H +#ifndef SOC_INTEL_COMMON_BLOCK_CFG_H +#define SOC_INTEL_COMMON_BLOCK_CFG_H
#include <intelblocks/gspi.h> #include <drivers/i2c/designware/dw_i2c.h> @@ -42,4 +42,4 @@ /* This function to retrieve soc config structure required by common code */ const struct soc_intel_common_config *chip_get_common_soc_structure(void);
-#endif /* SOC_INTEL_COMMON_BLOCK_CHIP_H */ +#endif /* SOC_INTEL_COMMON_BLOCK_CFG_H */ diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c index 5b2e2c7..4ff3ac5 100644 --- a/src/soc/intel/common/block/scs/mmc.c +++ b/src/soc/intel/common/block/scs/mmc.c @@ -16,7 +16,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <console/console.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/mmc.h>
static int mmc_write_dll_reg(void *bar, uint32_t reg, uint32_t val) diff --git a/src/soc/intel/common/block/thermal/thermal.c b/src/soc/intel/common/block/thermal/thermal.c index 39a98a4..8f2fd49 100644 --- a/src/soc/intel/common/block/thermal/thermal.c +++ b/src/soc/intel/common/block/thermal/thermal.c @@ -15,7 +15,7 @@
#include <console/console.h> #include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/thermal.h> #include <soc/pci_devs.h>
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c index 99d8a35..4a3209e 100644 --- a/src/soc/intel/common/pch/lockdown/lockdown.c +++ b/src/soc/intel/common/pch/lockdown/lockdown.c @@ -14,7 +14,7 @@ */
#include <bootstate.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/fast_spi.h> #include <intelblocks/pcr.h> #include <intelpch/lockdown.h> diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c index 951e1d2..2bb908c 100644 --- a/src/soc/intel/icelake/chip.c +++ b/src/soc/intel/icelake/chip.c @@ -18,7 +18,7 @@ #include <fsp/api.h> #include <fsp/util.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/xdci.h> #include <romstage_handoff.h> diff --git a/src/soc/intel/icelake/chip.h b/src/soc/intel/icelake/chip.h index 72596c4..fc9341c 100644 --- a/src/soc/intel/icelake/chip.h +++ b/src/soc/intel/icelake/chip.h @@ -16,7 +16,7 @@ #ifndef _SOC_CHIP_H_ #define _SOC_CHIP_H_
-#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gpio.h> #include <intelblocks/gspi.h> diff --git a/src/soc/intel/icelake/lockdown.c b/src/soc/intel/icelake/lockdown.c index 8fa5e15..85a93c7 100644 --- a/src/soc/intel/icelake/lockdown.c +++ b/src/soc/intel/icelake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelpch/lockdown.h> #include <soc/pm.h>
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c index 3d21a45..2c4ba67 100644 --- a/src/soc/intel/icelake/romstage/romstage.c +++ b/src/soc/intel/icelake/romstage/romstage.c @@ -17,7 +17,7 @@ #include <cbmem.h> #include <console/console.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> #include <memory_info.h> diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 212c244..ddb2932 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -19,7 +19,7 @@ #include <device/device.h> #include <device/pci.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/xdci.h> diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index fee14d8..70fb045 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -22,7 +22,7 @@ #include <arch/acpi_device.h> #include <device/i2c_simple.h> #include <drivers/i2c/designware/dw_i2c.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <intelblocks/lpc_lib.h> #include <stdint.h> diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c index 9d27a0f0..bdcca27 100644 --- a/src/soc/intel/skylake/chip_fsp20.c +++ b/src/soc/intel/skylake/chip_fsp20.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <device/pci_ids.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/mp_init.h> diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c index 9fd9bf3..316c633 100644 --- a/src/soc/intel/skylake/i2c.c +++ b/src/soc/intel/skylake/i2c.c @@ -15,7 +15,7 @@ */
#include <device/device.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <soc/pci_devs.h>
diff --git a/src/soc/intel/skylake/lockdown.c b/src/soc/intel/skylake/lockdown.c index 864cefe..69459e7 100644 --- a/src/soc/intel/skylake/lockdown.c +++ b/src/soc/intel/skylake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/lpc_lib.h> #include <intelpch/lockdown.h> #include <soc/pm.h>
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35657 )
Change subject: soc/intel: Rename <intelblocks/chip.h> ......................................................................
Patch Set 1: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35657 )
Change subject: soc/intel: Rename <intelblocks/chip.h> ......................................................................
Patch Set 1: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35657 )
Change subject: soc/intel: Rename <intelblocks/chip.h> ......................................................................
soc/intel: Rename <intelblocks/chip.h>
The filename chip.h has a special purpose with the generation of static devicetree, where the configuration structure name matches the path to the chip.h file. For example, soc/intel/skylake/chip.h defines struct soc_intel_skylake_config.
The renamed file did not follow this convention and the structure it defines would conflict with one defined soc/intel/common/chip.h if such is ever added.
Change-Id: Id3d56bf092c6111d2293136865b053b095e92d6b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35657 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/soc/intel/apollolake/chip.c M src/soc/intel/apollolake/chip.h M src/soc/intel/cannonlake/chip.c M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/lockdown.c M src/soc/intel/cannonlake/romstage/romstage.c M src/soc/intel/common/block/cpu/mp_init.c M src/soc/intel/common/block/gspi/gspi.c M src/soc/intel/common/block/i2c/i2c.c R src/soc/intel/common/block/include/intelblocks/cfg.h M src/soc/intel/common/block/scs/mmc.c M src/soc/intel/common/block/thermal/thermal.c M src/soc/intel/common/pch/lockdown/lockdown.c M src/soc/intel/icelake/chip.c M src/soc/intel/icelake/chip.h M src/soc/intel/icelake/lockdown.c M src/soc/intel/icelake/romstage/romstage.c M src/soc/intel/skylake/chip.c M src/soc/intel/skylake/chip.h M src/soc/intel/skylake/chip_fsp20.c M src/soc/intel/skylake/i2c.c M src/soc/intel/skylake/lockdown.c 22 files changed, 24 insertions(+), 24 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Furquan Shaikh: Looks good to me, approved
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index b69f9ee..b7159ef 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -28,7 +28,7 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/fast_spi.h> #include <intelblocks/msr.h> #include <intelblocks/p2sb.h> diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index b9e368c..85cfff9 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -20,7 +20,7 @@ #define _SOC_APOLLOLAKE_CHIP_H_
#include <commonlib/helpers.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <soc/gpe.h> #include <soc/gpio.h> diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c index 4e0dba5..c0810fb 100644 --- a/src/soc/intel/cannonlake/chip.c +++ b/src/soc/intel/cannonlake/chip.c @@ -18,7 +18,7 @@ #include <fsp/api.h> #include <fsp/util.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/xdci.h> #include <romstage_handoff.h> diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 451c920..b937699 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -18,7 +18,7 @@ #ifndef _SOC_CHIP_H_ #define _SOC_CHIP_H_
-#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gpio.h> #include <intelblocks/gspi.h> diff --git a/src/soc/intel/cannonlake/lockdown.c b/src/soc/intel/cannonlake/lockdown.c index e2fcc3a..ba68aa3 100644 --- a/src/soc/intel/cannonlake/lockdown.c +++ b/src/soc/intel/cannonlake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelpch/lockdown.h> #include <soc/pm.h>
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index ba583b9..f782f63 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -17,7 +17,7 @@ #include <cbmem.h> #include <console/console.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> #include <memory_info.h> diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c index e0cee17..2c5061f 100644 --- a/src/soc/intel/common/block/cpu/mp_init.c +++ b/src/soc/intel/common/block/cpu/mp_init.c @@ -21,7 +21,7 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mp.h> #include <cpu/intel/microcode.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cpulib.h> #include <intelblocks/fast_spi.h> #include <intelblocks/mp_init.h> diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c index f937bd6..33f376e 100644 --- a/src/soc/intel/common/block/gspi/gspi.c +++ b/src/soc/intel/common/block/gspi/gspi.c @@ -21,7 +21,7 @@ #include <device/device.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <intelblocks/lpss.h> #include <intelblocks/spi.h> diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 854a61a..fb7aea2 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -21,7 +21,7 @@ #include <device/pci_def.h> #include <device/pci_ids.h> #include <drivers/i2c/designware/dw_i2c.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/lpss.h> #include <soc/iomap.h> #include <soc/pci_devs.h> diff --git a/src/soc/intel/common/block/include/intelblocks/chip.h b/src/soc/intel/common/block/include/intelblocks/cfg.h similarity index 92% rename from src/soc/intel/common/block/include/intelblocks/chip.h rename to src/soc/intel/common/block/include/intelblocks/cfg.h index 1e830d5..e7e381b 100644 --- a/src/soc/intel/common/block/include/intelblocks/chip.h +++ b/src/soc/intel/common/block/include/intelblocks/cfg.h @@ -13,8 +13,8 @@ * GNU General Public License for more details. */
-#ifndef SOC_INTEL_COMMON_BLOCK_CHIP_H -#define SOC_INTEL_COMMON_BLOCK_CHIP_H +#ifndef SOC_INTEL_COMMON_BLOCK_CFG_H +#define SOC_INTEL_COMMON_BLOCK_CFG_H
#include <intelblocks/gspi.h> #include <drivers/i2c/designware/dw_i2c.h> @@ -42,4 +42,4 @@ /* This function to retrieve soc config structure required by common code */ const struct soc_intel_common_config *chip_get_common_soc_structure(void);
-#endif /* SOC_INTEL_COMMON_BLOCK_CHIP_H */ +#endif /* SOC_INTEL_COMMON_BLOCK_CFG_H */ diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c index 5b2e2c7..4ff3ac5 100644 --- a/src/soc/intel/common/block/scs/mmc.c +++ b/src/soc/intel/common/block/scs/mmc.c @@ -16,7 +16,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <console/console.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/mmc.h>
static int mmc_write_dll_reg(void *bar, uint32_t reg, uint32_t val) diff --git a/src/soc/intel/common/block/thermal/thermal.c b/src/soc/intel/common/block/thermal/thermal.c index 39a98a4..8f2fd49 100644 --- a/src/soc/intel/common/block/thermal/thermal.c +++ b/src/soc/intel/common/block/thermal/thermal.c @@ -15,7 +15,7 @@
#include <console/console.h> #include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/thermal.h> #include <soc/pci_devs.h>
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c index 99d8a35..4a3209e 100644 --- a/src/soc/intel/common/pch/lockdown/lockdown.c +++ b/src/soc/intel/common/pch/lockdown/lockdown.c @@ -14,7 +14,7 @@ */
#include <bootstate.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/fast_spi.h> #include <intelblocks/pcr.h> #include <intelpch/lockdown.h> diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c index c4abb0c..e71c573 100644 --- a/src/soc/intel/icelake/chip.c +++ b/src/soc/intel/icelake/chip.c @@ -18,7 +18,7 @@ #include <fsp/api.h> #include <fsp/util.h> #include <intelblocks/acpi.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/xdci.h> #include <romstage_handoff.h> diff --git a/src/soc/intel/icelake/chip.h b/src/soc/intel/icelake/chip.h index 72596c4..fc9341c 100644 --- a/src/soc/intel/icelake/chip.h +++ b/src/soc/intel/icelake/chip.h @@ -16,7 +16,7 @@ #ifndef _SOC_CHIP_H_ #define _SOC_CHIP_H_
-#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <intelblocks/gpio.h> #include <intelblocks/gspi.h> diff --git a/src/soc/intel/icelake/lockdown.c b/src/soc/intel/icelake/lockdown.c index 8fa5e15..85a93c7 100644 --- a/src/soc/intel/icelake/lockdown.c +++ b/src/soc/intel/icelake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelpch/lockdown.h> #include <soc/pm.h>
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c index 3d21a45..2c4ba67 100644 --- a/src/soc/intel/icelake/romstage/romstage.c +++ b/src/soc/intel/icelake/romstage/romstage.c @@ -17,7 +17,7 @@ #include <cbmem.h> #include <console/console.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/cse.h> #include <intelblocks/pmclib.h> #include <memory_info.h> diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 212c244..ddb2932 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -19,7 +19,7 @@ #include <device/device.h> #include <device/pci.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/xdci.h> diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index fee14d8..70fb045 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -22,7 +22,7 @@ #include <arch/acpi_device.h> #include <device/i2c_simple.h> #include <drivers/i2c/designware/dw_i2c.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/gspi.h> #include <intelblocks/lpc_lib.h> #include <stdint.h> diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c index d1d7d6f..e46e52c 100644 --- a/src/soc/intel/skylake/chip_fsp20.c +++ b/src/soc/intel/skylake/chip_fsp20.c @@ -23,7 +23,7 @@ #include <device/device.h> #include <device/pci_ids.h> #include <fsp/util.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/itss.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/mp_init.h> diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c index 9fd9bf3..316c633 100644 --- a/src/soc/intel/skylake/i2c.c +++ b/src/soc/intel/skylake/i2c.c @@ -15,7 +15,7 @@ */
#include <device/device.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <drivers/i2c/designware/dw_i2c.h> #include <soc/pci_devs.h>
diff --git a/src/soc/intel/skylake/lockdown.c b/src/soc/intel/skylake/lockdown.c index 864cefe..69459e7 100644 --- a/src/soc/intel/skylake/lockdown.c +++ b/src/soc/intel/skylake/lockdown.c @@ -14,7 +14,7 @@ */
#include <device/mmio.h> -#include <intelblocks/chip.h> +#include <intelblocks/cfg.h> #include <intelblocks/lpc_lib.h> #include <intelpch/lockdown.h> #include <soc/pm.h>