From 32d47eb688390d08e0f3f839df69371b55af8889 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Sat, 28 Sep 2019 00:00:30 +0300
Subject: soc/intel: Rename <intelblocks/chip.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/soc/intel/icelake/chip.c              | 2 +-
 src/soc/intel/icelake/chip.h              | 2 +-
 src/soc/intel/icelake/lockdown.c          | 2 +-
 src/soc/intel/icelake/romstage/romstage.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/soc/intel/icelake')

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>
-- 
cgit v1.2.3