summaryrefslogtreecommitdiff
path: root/src/soc/intel/meteorlake
diff options
context:
space:
mode:
authorElyes Haouas <ehaouas@noos.fr>2022-10-31 13:44:40 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-11-04 13:23:27 +0000
commitdef74aacedd4f33829347037f12cfc213b46bc6c (patch)
tree0046cc996ac4466c5109b5a6132e570deabdbae6 /src/soc/intel/meteorlake
parent059902882ce56502124375c9395ebe8b49640710 (diff)
soc/intel: Include <cpu/cpu.h> instead of <arch/cpu.h>
Also sort includes. Change-Id: I7da9c672ee230dfaebd943247639b78d675957e4 Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/69032 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src/soc/intel/meteorlake')
-rw-r--r--src/soc/intel/meteorlake/bootblock/report_platform.c4
-rw-r--r--src/soc/intel/meteorlake/cpu.c14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/intel/meteorlake/bootblock/report_platform.c b/src/soc/intel/meteorlake/bootblock/report_platform.c
index 72d0d83db4..63f1771933 100644
--- a/src/soc/intel/meteorlake/bootblock/report_platform.c
+++ b/src/soc/intel/meteorlake/bootblock/report_platform.c
@@ -1,14 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h>
-#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/cpu.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 <soc/bootblock.h>
#include <soc/pci_devs.h>
diff --git a/src/soc/intel/meteorlake/cpu.c b/src/soc/intel/meteorlake/cpu.c
index 00caaa529b..55ab15c419 100644
--- a/src/soc/intel/meteorlake/cpu.c
+++ b/src/soc/intel/meteorlake/cpu.c
@@ -1,25 +1,25 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h>
+#include <assert.h>
#include <console/console.h>
-#include <device/pci.h>
+#include <cpu/cpu.h>
+#include <cpu/intel/common/common.h>
+#include <cpu/intel/smm_reloc.h>
+#include <cpu/intel/turbo.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/mp.h>
#include <cpu/x86/msr.h>
-#include <cpu/intel/smm_reloc.h>
-#include <cpu/intel/turbo.h>
-#include <cpu/intel/common/common.h>
+#include <device/pci.h>
#include <fsp/api.h>
+#include <intelblocks/acpi.h>
#include <intelblocks/cpulib.h>
#include <intelblocks/mp_init.h>
#include <intelblocks/msr.h>
-#include <intelblocks/acpi.h>
#include <soc/cpu.h>
#include <soc/msr.h>
#include <soc/pci_devs.h>
#include <soc/soc_chip.h>
#include <soc/soc_info.h>
-#include <assert.h>
bool cpu_soc_is_in_untrusted_mode(void)
{