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/cannonlake | |
| 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/cannonlake')
| -rw-r--r-- | src/soc/intel/cannonlake/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/chip.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/lockdown.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/romstage/romstage.c | 2 |
4 files changed, 4 insertions, 4 deletions
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> |