From 82f4ca468d7fdad574652bdcca949aaa37555925 Mon Sep 17 00:00:00 2001
From: Subrata Banik <subrata.banik@intel.com>
Date: Fri, 16 Jul 2021 13:37:06 +0530
Subject: [PATCH] soc/intel/elkhartlake: Make use of `cpu/intel/cpu_ids.h'

Remove inclusion of mp_init.h for getting CPUIDs and use dedicated
cpu_ids.h file in SoC directory.

Change-Id: Ieb8063116bee59f6f6bf1f6b0b2349ce22bd67bd
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56378
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Lean Sheng Tan <lean.sheng.tan@intel.com>
---
 src/soc/intel/elkhartlake/bootblock/report_platform.c | 2 +-
 src/soc/intel/elkhartlake/fsp_params.c                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/soc/intel/elkhartlake/bootblock/report_platform.c b/src/soc/intel/elkhartlake/bootblock/report_platform.c
index 7d9e9f4e82..8d93e4dd7b 100644
--- a/src/soc/intel/elkhartlake/bootblock/report_platform.c
+++ b/src/soc/intel/elkhartlake/bootblock/report_platform.c
@@ -2,13 +2,13 @@
 
 #include <arch/cpu.h>
 #include <console/console.h>
+#include <cpu/intel/cpu_ids.h>
 #include <cpu/intel/microcode.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/name.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <intelblocks/mp_init.h>
 #include <soc/bootblock.h>
 #include <soc/pch.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/elkhartlake/fsp_params.c b/src/soc/intel/elkhartlake/fsp_params.c
index 210040e75b..da9a783f42 100644
--- a/src/soc/intel/elkhartlake/fsp_params.c
+++ b/src/soc/intel/elkhartlake/fsp_params.c
@@ -6,7 +6,6 @@
 #include <fsp/ppi/mp_service_ppi.h>
 #include <fsp/util.h>
 #include <intelblocks/lpss.h>
-#include <intelblocks/mp_init.h>
 #include <intelblocks/pmclib.h>
 #include <intelblocks/xdci.h>
 #include <intelpch/lockdown.h>