diff options
Diffstat (limited to 'src/soc/intel/common')
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi.c | 10 | ||||
| -rw-r--r-- | src/soc/intel/common/block/acpi/sgx.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cpu/cpulib.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cse/cse_lite.c | 8 | ||||
| -rw-r--r-- | src/soc/intel/common/block/timer/timer.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 99cf23fd4f..f0903ff80e 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -2,16 +2,17 @@ #include <acpi/acpi_pm.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> -#include <cpu/intel/turbo.h> -#include <cpu/intel/msr.h> +#include <cpu/cpu.h> #include <cpu/intel/common/common.h> +#include <cpu/intel/msr.h> +#include <cpu/intel/turbo.h> +#include <cpu/x86/lapic.h> #include <cpu/x86/smm.h> -#include <intelblocks/acpi.h> #include <intelblocks/acpi_wake_source.h> +#include <intelblocks/acpi.h> #include <intelblocks/lpc_lib.h> #include <intelblocks/pmclib.h> #include <intelblocks/sgx.h> @@ -19,7 +20,6 @@ #include <soc/gpio.h> #include <soc/iomap.h> #include <soc/pm.h> -#include <cpu/x86/lapic.h> #define CPUID_6_EAX_ISST (1 << 7) diff --git a/src/soc/intel/common/block/acpi/sgx.c b/src/soc/intel/common/block/acpi/sgx.c index 7d9073d9ab..4d2bab52f9 100644 --- a/src/soc/intel/common/block/acpi/sgx.c +++ b/src/soc/intel/common/block/acpi/sgx.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpigen.h> -#include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <intelblocks/acpi.h> #include <intelblocks/sgx.h> diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c index 4898066d4a..1c7a173a7c 100644 --- a/src/soc/intel/common/block/cpu/cpulib.c +++ b/src/soc/intel/common/block/cpu/cpulib.c @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <assert.h> #include <acpi/acpigen.h> +#include <assert.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/intel/common/common.h> #include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> -#include <arch/cpu.h> #include <intelblocks/cpulib.h> #include <intelblocks/fast_spi.h> #include <intelblocks/msr.h> diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 1d30a8d0d5..f051061e7d 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -1,17 +1,17 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi.h> -#include <arch/cpu.h> #include <bootstate.h> -#include <console/console.h> #include <cbfs.h> #include <commonlib/region.h> +#include <console/console.h> +#include <cpu/cpu.h> #include <fmap.h> +#include <intelbasecode/debug_feature.h> #include <intelblocks/cse.h> #include <intelblocks/cse_layout.h> -#include <intelbasecode/debug_feature.h> -#include <security/vboot/vboot_common.h> #include <security/vboot/misc.h> +#include <security/vboot/vboot_common.h> #include <soc/intel/common/reset.h> #include <timestamp.h> diff --git a/src/soc/intel/common/block/timer/timer.c b/src/soc/intel/common/block/timer/timer.c index 0d201a50e5..88d1bf2fdb 100644 --- a/src/soc/intel/common/block/timer/timer.c +++ b/src/soc/intel/common/block/timer/timer.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/tsc.h> #include <intelblocks/msr.h> |