Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34085 )
Change subject: soc/intel/icelake: Refer to soc/soc_chip.h rather than chip.h ......................................................................
soc/intel/icelake: Refer to soc/soc_chip.h rather than chip.h
Change-Id: I9e3b5126173e7cec8f2809a38b92c82c9ed5327d Signed-off-by: Subrata Banik subrata.banik@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34085 Reviewed-by: Aamir Bohra aamir.bohra@intel.com Reviewed-by: Lean Sheng Tan lean.sheng.tan@intel.com Reviewed-by: Furquan Shaikh furquan@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/icelake/acpi.c M src/soc/intel/icelake/chip.c M src/soc/intel/icelake/cpu.c M src/soc/intel/icelake/espi.c M src/soc/intel/icelake/finalize.c M src/soc/intel/icelake/fsp_params.c M src/soc/intel/icelake/include/soc/ramstage.h M src/soc/intel/icelake/memmap.c M src/soc/intel/icelake/pmc.c M src/soc/intel/icelake/pmutil.c M src/soc/intel/icelake/romstage/fsp_params.c M src/soc/intel/icelake/romstage/romstage.c M src/soc/intel/icelake/sd.c M src/soc/intel/icelake/smihandler.c M src/soc/intel/icelake/smmrelocate.c 15 files changed, 15 insertions(+), 26 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Aamir Bohra: Looks good to me, approved Lean Sheng Tan: Looks good to me, but someone else must approve
diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index 3a46c93..ae7b344 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/src/soc/intel/icelake/acpi.c @@ -27,12 +27,11 @@ #include <soc/nvs.h> #include <soc/pci_devs.h> #include <soc/pm.h> +#include <soc/soc_chip.h> #include <string.h> #include <vendorcode/google/chromeos/gnvs.h> #include <wrdd.h>
-#include "chip.h" - /* * List of supported C-states in this processor. */ diff --git a/src/soc/intel/icelake/chip.c b/src/soc/intel/icelake/chip.c index eff1c7a..ceef266 100644 --- a/src/soc/intel/icelake/chip.c +++ b/src/soc/intel/icelake/chip.c @@ -26,8 +26,7 @@ #include <soc/itss.h> #include <soc/pci_devs.h> #include <soc/ramstage.h> - -#include "chip.h" +#include <soc/soc_chip.h>
#if CONFIG(HAVE_ACPI_TABLES) const char *soc_acpi_name(const struct device *dev) diff --git a/src/soc/intel/icelake/cpu.c b/src/soc/intel/icelake/cpu.c index 527b989..67d41d7 100644 --- a/src/soc/intel/icelake/cpu.c +++ b/src/soc/intel/icelake/cpu.c @@ -31,8 +31,7 @@ #include <soc/pci_devs.h> #include <soc/pm.h> #include <soc/smm.h> - -#include "chip.h" +#include <soc/soc_chip.h>
static void soc_fsp_load(void) { diff --git a/src/soc/intel/icelake/espi.c b/src/soc/intel/icelake/espi.c index 8ab909d..a4b6d80 100644 --- a/src/soc/intel/icelake/espi.c +++ b/src/soc/intel/icelake/espi.c @@ -29,8 +29,7 @@ #include <soc/irq.h> #include <soc/pci_devs.h> #include <soc/pcr_ids.h> - -#include "chip.h" +#include <soc/soc_chip.h>
/* * As per the BWG, Chapter 5.9.1. "PCH BIOS component will reserve diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c index b838c19..e035c95 100644 --- a/src/soc/intel/icelake/finalize.c +++ b/src/soc/intel/icelake/finalize.c @@ -30,11 +30,10 @@ #include <soc/pcr_ids.h> #include <soc/pm.h> #include <soc/smbus.h> +#include <soc/soc_chip.h> #include <soc/systemagent.h> #include <stdlib.h>
-#include "chip.h" - #define CAMERA1_CLK 0x8000 /* Camera 1 Clock */ #define CAMERA2_CLK 0x8080 /* Camera 2 Clock */ #define CAM_CLK_EN (1 << 1) diff --git a/src/soc/intel/icelake/fsp_params.c b/src/soc/intel/icelake/fsp_params.c index ac7edd2..8b65a89 100644 --- a/src/soc/intel/icelake/fsp_params.c +++ b/src/soc/intel/icelake/fsp_params.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */
-#include <chip.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -23,6 +22,7 @@ #include <soc/intel/common/vbt.h> #include <soc/pci_devs.h> #include <soc/ramstage.h> +#include <soc/soc_chip.h> #include <string.h> #include <intelblocks/mp_init.h> #include <fsp/ppi/mp_service_ppi.h> diff --git a/src/soc/intel/icelake/include/soc/ramstage.h b/src/soc/intel/icelake/include/soc/ramstage.h index d78380a..606e2ff 100644 --- a/src/soc/intel/icelake/include/soc/ramstage.h +++ b/src/soc/intel/icelake/include/soc/ramstage.h @@ -19,8 +19,7 @@ #include <device/device.h> #include <fsp/api.h> #include <fsp/util.h> - -#include "../../chip.h" +#include <soc/soc_chip.h>
void mainboard_silicon_init_params(FSP_S_CONFIG *params); void soc_init_pre_device(void *chip_info); diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c index 49af604..67f71da 100644 --- a/src/soc/intel/icelake/memmap.c +++ b/src/soc/intel/icelake/memmap.c @@ -23,11 +23,10 @@ #include <intelblocks/systemagent.h> #include <soc/pci_devs.h> #include <soc/smm.h> +#include <soc/soc_chip.h> #include <soc/systemagent.h> #include <stdlib.h>
-#include "chip.h" - void smm_region(void **start, size_t *size) { *start = (void *)sa_get_tseg_base(); diff --git a/src/soc/intel/icelake/pmc.c b/src/soc/intel/icelake/pmc.c index 053d7e8..d98c83e 100644 --- a/src/soc/intel/icelake/pmc.c +++ b/src/soc/intel/icelake/pmc.c @@ -23,8 +23,7 @@ #include <intelblocks/rtc.h> #include <soc/pci_devs.h> #include <soc/pm.h> - -#include "chip.h" +#include <soc/soc_chip.h>
/* * Set which power state system will be after reapplying diff --git a/src/soc/intel/icelake/pmutil.c b/src/soc/intel/icelake/pmutil.c index 0edec4b..45f2a70 100644 --- a/src/soc/intel/icelake/pmutil.c +++ b/src/soc/intel/icelake/pmutil.c @@ -37,10 +37,9 @@ #include <soc/pci_devs.h> #include <soc/pm.h> #include <soc/smbus.h> +#include <soc/soc_chip.h> #include <security/vboot/vbnv.h>
-#include "chip.h" - /* * SMI */ diff --git a/src/soc/intel/icelake/romstage/fsp_params.c b/src/soc/intel/icelake/romstage/fsp_params.c index fa6f939..420c427 100644 --- a/src/soc/intel/icelake/romstage/fsp_params.c +++ b/src/soc/intel/icelake/romstage/fsp_params.c @@ -14,12 +14,12 @@ */
#include <assert.h> -#include <chip.h> #include <console/console.h> #include <fsp/util.h> #include <soc/iomap.h> #include <soc/pci_devs.h> #include <soc/romstage.h> +#include <soc/soc_chip.h>
static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, const struct soc_intel_icelake_config *config) diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c index 514e5e8..65e65cc 100644 --- a/src/soc/intel/icelake/romstage/romstage.c +++ b/src/soc/intel/icelake/romstage/romstage.c @@ -27,11 +27,10 @@ #include <soc/pci_devs.h> #include <soc/pm.h> #include <soc/romstage.h> +#include <soc/soc_chip.h> #include <string.h> #include <timestamp.h>
-#include "../chip.h" - #define FSP_SMBIOS_MEMORY_INFO_GUID \ { \ 0xd4, 0x71, 0x20, 0x9b, 0x54, 0xb0, 0x0c, 0x4e, \ diff --git a/src/soc/intel/icelake/sd.c b/src/soc/intel/icelake/sd.c index 19c3bca..4d84bb4 100644 --- a/src/soc/intel/icelake/sd.c +++ b/src/soc/intel/icelake/sd.c @@ -14,7 +14,7 @@ */
#include <intelblocks/sd.h> -#include "chip.h" +#include <soc/soc_chip.h>
int sd_fill_soc_gpio_info(struct acpi_gpio *gpio, struct device *dev) { diff --git a/src/soc/intel/icelake/smihandler.c b/src/soc/intel/icelake/smihandler.c index a7ea094..3d41ee0 100644 --- a/src/soc/intel/icelake/smihandler.c +++ b/src/soc/intel/icelake/smihandler.c @@ -23,8 +23,7 @@ #include <soc/pci_devs.h> #include <soc/pcr_ids.h> #include <soc/pm.h> - -#include "chip.h" +#include <soc/soc_chip.h>
#define CSME0_FBE 0xf #define CSME0_BAR 0x0 diff --git a/src/soc/intel/icelake/smmrelocate.c b/src/soc/intel/icelake/smmrelocate.c index 05871e4..4e2d684 100644 --- a/src/soc/intel/icelake/smmrelocate.c +++ b/src/soc/intel/icelake/smmrelocate.c @@ -31,8 +31,8 @@ #include <soc/msr.h> #include <soc/pci_devs.h> #include <soc/smm.h> +#include <soc/soc_chip.h> #include <soc/systemagent.h> -#include "chip.h"
/* This gets filled in and used during relocation. */ static struct smm_relocation_params smm_reloc_params;