diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-28 00:00:30 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-09-29 03:38:13 +0000 |
| commit | 32d47eb688390d08e0f3f839df69371b55af8889 (patch) | |
| tree | 5d00c058182b85e8baa39ee43d2d74731b5f0f56 /src/soc/intel/common | |
| parent | 44da9e201c58faf94ad22ec0fe18b693fd9d1239 (diff) | |
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>
Diffstat (limited to 'src/soc/intel/common')
| -rw-r--r-- | src/soc/intel/common/block/cpu/mp_init.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/gspi/gspi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/i2c/i2c.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/cfg.h (renamed from src/soc/intel/common/block/include/intelblocks/chip.h) | 6 | ||||
| -rw-r--r-- | src/soc/intel/common/block/scs/mmc.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/thermal/thermal.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/pch/lockdown/lockdown.c | 2 |
7 files changed, 9 insertions, 9 deletions
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> |