diff options
22 files changed, 24 insertions, 24 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index b69f9eeeef..b7159efaec 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 b9e368cddc..85cfff9af5 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 4e0dba5cea..c0810fb2ea 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 451c920fae..b937699c3c 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 e2fcc3a46e..ba68aa385c 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 ba583b9a6e..f782f63622 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 e0cee1771e..2c5061f1d6 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 f937bd6eed..33f376ee77 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 854a61a884..fb7aea2c17 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 index 1e830d5d17..e7e381bfe4 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 @@ struct soc_intel_common_config { /* 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 5b2e2c7d33..4ff3ac5e7e 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 39a98a41d8..8f2fd49da2 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 99d8a35ea7..4a3209e03e 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 c4abb0c3f7..e71c573f98 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 72596c46e2..fc9341c58b 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 8fa5e154f2..85a93c7c8e 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 3d21a45e33..2c4ba67e04 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 212c24467e..ddb29327a1 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 fee14d8d7e..70fb045baf 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 d1d7d6f50a..e46e52ccd2 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 9fd9bf39e6..316c633c4d 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 864cefe0b9..69459e7e03 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> |