Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69029 )
Change subject: /: Include <cpu/cpu.h> instead of <arch/cpu.h> ......................................................................
/: Include <cpu/cpu.h> instead of <arch/cpu.h>
Change-Id: Ie36e8d7d789471bdab92d98231dccd4b5a1551c9 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M src/arch/riscv/virtual_memory.c M src/arch/x86/acpi_s3.c M src/arch/x86/boot.c M src/arch/x86/exception.c M src/arch/x86/include/arch/exception.h M src/arch/x86/romstage.c M src/arch/x86/smbios.c M src/arch/x86/verstage.c M src/cpu/amd/pi/00730F01/update_microcode.c M src/cpu/intel/common/common_init.c M src/cpu/intel/common/fsb.c M src/cpu/intel/common/hyperthreading.c M src/cpu/intel/haswell/acpi.c M src/cpu/intel/haswell/haswell.h M src/cpu/intel/hyperthreading/intel_sibling.c M src/cpu/intel/microcode/microcode.c M src/cpu/intel/model_2065x/acpi.c M src/cpu/intel/model_206ax/acpi.c M src/cpu/intel/model_206ax/bootblock.c M src/cpu/intel/model_206ax/model_206ax.h M src/cpu/intel/slot_1/l2_cache.c M src/cpu/intel/speedstep/acpi.c M src/cpu/intel/speedstep/speedstep.c M src/cpu/intel/turbo/turbo.c M src/cpu/x86/mtrr/xip_cache.c M src/cpu/x86/name/name.c M src/cpu/x86/pae/pgtbl.c M src/cpu/x86/tsc/delay_tsc.c M src/device/oprom/realmode/x86.h M src/drivers/amd/agesa/romstage.c M src/drivers/intel/fsp1_1/include/fsp/util.h M src/drivers/intel/fsp2_0/include/fsp/util.h M src/drivers/intel/mipi_camera/camera.c M src/ec/google/wilco/chip.c M src/include/bootblock_common.h M src/include/cpu/x86/lapic.h M src/include/cpu/x86/mtrr.h M src/include/cpu/x86/smm.h M src/include/thread.h M src/lib/gcc.c M src/mainboard/asus/p5gc-mx/early_init.c M src/mainboard/google/poppy/variants/nami/mainboard.c M src/mainboard/intel/adlrvp/mainboard.c M src/mainboard/intel/icelake_rvp/spd/spd_util.c M src/mainboard/prodrive/hermes/mainboard.c M src/northbridge/intel/gm45/raminit.c M src/northbridge/intel/haswell/report_platform.c M src/northbridge/intel/ironlake/early_init.c M src/northbridge/intel/sandybridge/early_dmi.c M src/northbridge/intel/sandybridge/raminit.c M src/northbridge/intel/sandybridge/raminit_mrc.c M src/northbridge/intel/x4x/raminit.c M src/security/intel/txt/romstage.c M src/soc/amd/cezanne/romstage.c M src/soc/amd/common/block/acpi/cppc.c M src/soc/amd/common/block/cpu/cpu.c M src/soc/amd/common/block/cpu/noncar/write_resume_eip.c M src/soc/amd/common/block/cpu/update_microcode.c M src/soc/amd/glinda/romstage.c M src/soc/amd/mendocino/romstage.c M src/soc/amd/morgana/romstage.c M src/soc/amd/picasso/agesa_acpi.c M src/soc/amd/picasso/romstage.c M src/soc/amd/picasso/soc_util.c M src/soc/amd/stoneyridge/romstage.c M src/soc/intel/alderlake/bootblock/report_platform.c M src/soc/intel/alderlake/bootblock/update_descriptor.c M src/soc/intel/apollolake/report_platform.c M src/soc/intel/baytrail/ramstage.c M src/soc/intel/braswell/ramstage.c M src/soc/intel/broadwell/report_platform.c M src/soc/intel/cannonlake/bootblock/report_platform.c M src/soc/intel/common/block/acpi/acpi.c M src/soc/intel/common/block/acpi/sgx.c M src/soc/intel/common/block/cpu/cpulib.c M src/soc/intel/common/block/cse/cse_lite.c M src/soc/intel/common/block/timer/timer.c M src/soc/intel/elkhartlake/bootblock/report_platform.c M src/soc/intel/icelake/bootblock/report_platform.c M src/soc/intel/jasperlake/bootblock/report_platform.c M src/soc/intel/meteorlake/bootblock/report_platform.c M src/soc/intel/meteorlake/cpu.c M src/soc/intel/quark/include/soc/ramstage.h M src/soc/intel/quark/romstage/report_platform.c M src/soc/intel/skylake/acpi.c M src/soc/intel/skylake/bootblock/report_platform.c M src/soc/intel/tigerlake/bootblock/report_platform.c M src/soc/intel/tigerlake/lpm.c M src/soc/samsung/exynos5420/smp.c M src/southbridge/intel/ibexpeak/early_cir.c 90 files changed, 100 insertions(+), 90 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/69029/1
diff --git a/src/arch/riscv/virtual_memory.c b/src/arch/riscv/virtual_memory.c index 43e3d70..f30b3c4 100644 --- a/src/arch/riscv/virtual_memory.c +++ b/src/arch/riscv/virtual_memory.c @@ -3,7 +3,7 @@ * Early initialization code for riscv virtual memory */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/encoding.h> #include <vm.h>
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index ec1fafc..289aa71 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -3,7 +3,7 @@ #include <console/console.h> #include <string.h> #include <acpi/acpi.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <commonlib/helpers.h> #include <fallback.h> #include <timestamp.h> diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c index c50ec0e..8194d50 100644 --- a/src/arch/x86/boot.c +++ b/src/arch/x86/boot.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/boot/boot.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <commonlib/helpers.h> #include <console/console.h> #include <program_loading.h> diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c index 5f6c0fc..31ae4d8 100644 --- a/src/arch/x86/exception.c +++ b/src/arch/x86/exception.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/breakpoint.h> #include <arch/null_breakpoint.h> #include <arch/exception.h> diff --git a/src/arch/x86/include/arch/exception.h b/src/arch/x86/include/arch/exception.h index 14e35b9..8fe9eac 100644 --- a/src/arch/x86/include/arch/exception.h +++ b/src/arch/x86/include/arch/exception.h @@ -3,7 +3,7 @@ #ifndef _ARCH_EXCEPTION_H #define _ARCH_EXCEPTION_H
-#include <arch/cpu.h> +#include <cpu/cpu.h>
#if CONFIG(IDT_IN_EVERY_STAGE) || ENV_RAMSTAGE asmlinkage void exception_init(void); diff --git a/src/arch/x86/romstage.c b/src/arch/x86/romstage.c index a7ee4d9..8744ee4 100644 --- a/src/arch/x86/romstage.c +++ b/src/arch/x86/romstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <timestamp.h> #include <romstage_common.h> diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index 24b18f2..7a2cb49 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -7,7 +7,7 @@ #include <version.h> #include <device/device.h> #include <device/dram/spd.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/name.h> #include <elog.h> #include <endian.h> diff --git a/src/arch/x86/verstage.c b/src/arch/x86/verstage.c index 633fd8c..ea35b74 100644 --- a/src/arch/x86/verstage.c +++ b/src/arch/x86/verstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <main_decl.h>
/* Provide an entry point for verstage when it's a separate stage. */ diff --git a/src/cpu/amd/pi/00730F01/update_microcode.c b/src/cpu/amd/pi/00730F01/update_microcode.c index 7c15f9b..0430ff4 100644 --- a/src/cpu/amd/pi/00730F01/update_microcode.c +++ b/src/cpu/amd/pi/00730F01/update_microcode.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <stdint.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/amd/microcode.h> #include <commonlib/helpers.h> #include <console/console.h> diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c index 9da162d..b23e38d 100644 --- a/src/cpu/intel/common/common_init.c +++ b/src/cpu/intel/common/common_init.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/msr.h> #include <cpu/intel/turbo.h> diff --git a/src/cpu/intel/common/fsb.c b/src/cpu/intel/common/fsb.c index 92f88cd..00726df 100644 --- a/src/cpu/intel/common/fsb.c +++ b/src/cpu/intel/common/fsb.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <commonlib/helpers.h> #include <console/console.h> #include <cpu/intel/fsb.h> diff --git a/src/cpu/intel/common/hyperthreading.c b/src/cpu/intel/common/hyperthreading.c index f9170b3..c31ccf2 100644 --- a/src/cpu/intel/common/hyperthreading.c +++ b/src/cpu/intel/common/hyperthreading.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <cpu/intel/common/common.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <types.h>
bool intel_ht_supported(void) diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c index 5e5fa81..0c20421 100644 --- a/src/cpu/intel/haswell/acpi.c +++ b/src/cpu/intel/haswell/acpi.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <acpi/acpi.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> #include <cpu/intel/turbo.h> diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index 133a129..5697d0f 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -3,7 +3,7 @@ #ifndef _CPU_INTEL_HASWELL_H #define _CPU_INTEL_HASWELL_H
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <stdint.h>
/* CPU types without stepping */ diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c index 9fde031..cada365 100644 --- a/src/cpu/intel/hyperthreading/intel_sibling.c +++ b/src/cpu/intel/hyperthreading/intel_sibling.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/hyperthreading.h> #include <device/device.h> diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c index ac9453f..3c1dfad 100644 --- a/src/cpu/intel/microcode/microcode.c +++ b/src/cpu/intel/microcode/microcode.c @@ -2,7 +2,7 @@
/* Microcode update for Intel PIII and later CPUs */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cbfs.h> #include <console/console.h> #include <cpu/intel/microcode.h> diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c index 9d11ef0..5974707 100644 --- a/src/cpu/intel/model_2065x/acpi.c +++ b/src/cpu/intel/model_2065x/acpi.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <acpi/acpi.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> #include <cpu/intel/turbo.h> diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index 08548c5..3d81212 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -3,7 +3,7 @@ #include <console/console.h> #include <acpi/acpi.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> #include <cpu/intel/turbo.h> diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c index 6d2e486..2dccc39 100644 --- a/src/cpu/intel/model_206ax/bootblock.c +++ b/src/cpu/intel/model_206ax/bootblock.c @@ -2,7 +2,7 @@
#include <stdint.h> #include <arch/bootblock.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <arch/io.h> #include <halt.h> diff --git a/src/cpu/intel/model_206ax/model_206ax.h b/src/cpu/intel/model_206ax/model_206ax.h index 04e4639..b145523 100644 --- a/src/cpu/intel/model_206ax/model_206ax.h +++ b/src/cpu/intel/model_206ax/model_206ax.h @@ -3,7 +3,7 @@ #ifndef _CPU_INTEL_MODEL_206AX_H #define _CPU_INTEL_MODEL_206AX_H
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <stdint.h>
/* SandyBridge CPU stepping */ diff --git a/src/cpu/intel/slot_1/l2_cache.c b/src/cpu/intel/slot_1/l2_cache.c index fa43366..9ca569d 100644 --- a/src/cpu/intel/slot_1/l2_cache.c +++ b/src/cpu/intel/slot_1/l2_cache.c @@ -24,7 +24,7 @@ */
#include <stdint.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/l2_cache.h> #include <cpu/x86/cache.h> diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index d997ee8..024cd32 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -4,7 +4,7 @@ #include <console/console.h> #include <acpi/acpi.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/intel/fsb.h> #include <cpu/intel/speedstep.h> #include <device/device.h> diff --git a/src/cpu/intel/speedstep/speedstep.c b/src/cpu/intel/speedstep/speedstep.c index 9235272..0e1af3f 100644 --- a/src/cpu/intel/speedstep/speedstep.c +++ b/src/cpu/intel/speedstep/speedstep.c @@ -2,7 +2,7 @@
#include <types.h> #include <string.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <console/console.h> #include <cpu/intel/speedstep.h> diff --git a/src/cpu/intel/turbo/turbo.c b/src/cpu/intel/turbo/turbo.c index 5d84745..b650d63 100644 --- a/src/cpu/intel/turbo/turbo.c +++ b/src/cpu/intel/turbo/turbo.c @@ -3,7 +3,7 @@ #include <console/console.h> #include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> -#include <arch/cpu.h> +#include <cpu/cpu.h>
#if CONFIG(CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED) static inline int get_global_turbo_state(void) diff --git a/src/cpu/x86/mtrr/xip_cache.c b/src/cpu/x86/mtrr/xip_cache.c index 6ed96af..f0b76da 100644 --- a/src/cpu/x86/mtrr/xip_cache.c +++ b/src/cpu/x86/mtrr/xip_cache.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <program_loading.h> #include <commonlib/region.h> #include <console/console.h> diff --git a/src/cpu/x86/name/name.c b/src/cpu/x86/name/name.c index bf62aef..1b71e5d 100644 --- a/src/cpu/x86/name/name.c +++ b/src/cpu/x86/name/name.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/name.h> #include <stdint.h> #include <string.h> diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c index dceeb88..0d7575a 100644 --- a/src/cpu/x86/pae/pgtbl.c +++ b/src/cpu/x86/pae/pgtbl.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cbfs.h> #include <commonlib/helpers.h> #include <console/console.h> diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index 978a6ee..4253b18 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.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 <delay.h> #include <stdint.h> diff --git a/src/device/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h index b0efe90..a770bcd 100644 --- a/src/device/oprom/realmode/x86.h +++ b/src/device/oprom/realmode/x86.h @@ -3,7 +3,7 @@ #ifndef __DEVICE_OPROM_REALMODE_X86_H__ #define __DEVICE_OPROM_REALMODE_X86_H__
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <stdint.h>
#define REALMODE_BASE ((void *)0x600) diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c index f60239a..4f259aa 100644 --- a/src/drivers/amd/agesa/romstage.c +++ b/src/drivers/amd/agesa/romstage.c @@ -2,7 +2,7 @@
#include <amdblocks/biosram.h> #include <acpi/acpi.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/romstage.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h index 2dec3f0..2f92760 100644 --- a/src/drivers/intel/fsp1_1/include/fsp/util.h +++ b/src/drivers/intel/fsp1_1/include/fsp/util.h @@ -3,7 +3,7 @@ #ifndef FSP1_1_UTIL_H #define FSP1_1_UTIL_H
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <fsp/api.h> /* Current users expect to get the SoC's FSP definitions by including util.h. */ #include <fsp/soc_binding.h> diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 96dc472..1cc422e 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -6,7 +6,7 @@ #include <boot/coreboot_tables.h> #include <cbfs.h> #include <commonlib/region.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <efi/efi_datatype.h> #include <fsp/info_header.h> diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c index ad473bc..5b69c01 100644 --- a/src/drivers/intel/mipi_camera/camera.c +++ b/src/drivers/intel/mipi_camera/camera.c @@ -5,7 +5,7 @@ #include <acpi/acpi_device.h> #include <acpi/acpigen.h> #include <acpi/acpigen_pci.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> #include <device/i2c_simple.h> diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c index 2243004..903933c 100644 --- a/src/ec/google/wilco/chip.c +++ b/src/ec/google/wilco/chip.c @@ -3,7 +3,7 @@ #include <acpi/acpi.h> #include <acpi/acpi_device.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h index fccd235..a95700b 100644 --- a/src/include/bootblock_common.h +++ b/src/include/bootblock_common.h @@ -3,7 +3,7 @@ #ifndef __BOOTBLOCK_COMMON_H #define __BOOTBLOCK_COMMON_H
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <main_decl.h> #include <timestamp.h> #include <types.h> diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 5fa5608..334c542 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -4,7 +4,7 @@ #define CPU_X86_LAPIC_H
#include <arch/mmio.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/x86/lapic_def.h> #include <cpu/x86/msr.h> #include <halt.h> diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index 298947a..255fe2b 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -5,7 +5,7 @@
#ifndef __ASSEMBLER__ #include <cpu/x86/msr.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #endif
/* These are the region types */ diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index b6d778b..3f61b23 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -3,7 +3,7 @@ #ifndef CPU_X86_SMM_H #define CPU_X86_SMM_H
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <commonlib/region.h> #include <types.h>
diff --git a/src/include/thread.h b/src/include/thread.h index 059ba52..7e8856f 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -2,7 +2,7 @@ #ifndef THREAD_H_ #define THREAD_H_
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <bootstate.h> #include <types.h>
diff --git a/src/lib/gcc.c b/src/lib/gcc.c index 1e20506..f6a853d 100644 --- a/src/lib/gcc.c +++ b/src/lib/gcc.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h>
/* GCC's libgcc handling is quite broken. While the libgcc functions * are always regparm(0) the code that calls them uses whatever the diff --git a/src/mainboard/asus/p5gc-mx/early_init.c b/src/mainboard/asus/p5gc-mx/early_init.c index 22b6f0d..0ab5056 100644 --- a/src/mainboard/asus/p5gc-mx/early_init.c +++ b/src/mainboard/asus/p5gc-mx/early_init.c @@ -11,7 +11,7 @@ #include <southbridge/intel/i82801gx/i82801gx.h> #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> -#include <arch/cpu.h> +#include <cpu/cpu.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627DHG_SP1) #define GPIO_DEV PNP_DEV(0x2e, W83627DHG_GPIO2345_V) diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 629469d..5cce5be 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <assert.h> #include <baseboard/variants.h> #include <cbfs.h> diff --git a/src/mainboard/intel/adlrvp/mainboard.c b/src/mainboard/intel/adlrvp/mainboard.c index 9862820..e6a5a66 100644 --- a/src/mainboard/intel/adlrvp/mainboard.c +++ b/src/mainboard/intel/adlrvp/mainboard.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <baseboard/gpio.h> #include <baseboard/variants.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c index 12c3c0f..39dd65a 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <intelblocks/mp_init.h> #include <stdint.h> #include <string.h> diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c index b85186d..1ae3481 100644 --- a/src/mainboard/prodrive/hermes/mainboard.c +++ b/src/mainboard/prodrive/hermes/mainboard.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index 4196edf..907dc92 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -2,7 +2,7 @@
#include <commonlib/helpers.h> #include <stdint.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <device/pci_def.h> diff --git a/src/northbridge/intel/haswell/report_platform.c b/src/northbridge/intel/haswell/report_platform.c index 0b5319b..caa68a1 100644 --- a/src/northbridge/intel/haswell/report_platform.c +++ b/src/northbridge/intel/haswell/report_platform.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/intel/microcode.h> #include <string.h> #include <southbridge/intel/lynxpoint/pch.h> diff --git a/src/northbridge/intel/ironlake/early_init.c b/src/northbridge/intel/ironlake/early_init.c index b765417..ab347ba 100644 --- a/src/northbridge/intel/ironlake/early_init.c +++ b/src/northbridge/intel/ironlake/early_init.c @@ -9,7 +9,7 @@ #include <cpu/x86/msr.h> #include <cpu/intel/speedstep.h> #include <cpu/intel/turbo.h> -#include <arch/cpu.h> +#include <cpu/cpu.h>
#include "ironlake.h"
diff --git a/src/northbridge/intel/sandybridge/early_dmi.c b/src/northbridge/intel/sandybridge/early_dmi.c index d9b7ed2..7e8e022 100644 --- a/src/northbridge/intel/sandybridge/early_dmi.c +++ b/src/northbridge/intel/sandybridge/early_dmi.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/model_206ax/model_206ax.h> #include <northbridge/intel/sandybridge/sandybridge.h> diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index 5044512..7ed74be 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -4,7 +4,7 @@ #include <commonlib/region.h> #include <cf9_reset.h> #include <string.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <device/smbus_host.h> diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c index a308d07..1bae3ff 100644 --- a/src/northbridge/intel/sandybridge/raminit_mrc.c +++ b/src/northbridge/intel/sandybridge/raminit_mrc.c @@ -8,7 +8,7 @@ #include <device/device.h> #include <device/dram/ddr3.h> #include <device/pci_ops.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cbmem.h> #include <cbfs.h> #include <ip_checksum.h> diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c index b4366fb..2f38c50 100644 --- a/src/northbridge/intel/x4x/raminit.c +++ b/src/northbridge/intel/x4x/raminit.c @@ -5,7 +5,7 @@ #include <cbmem.h> #include <cf9_reset.h> #include <console/console.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <spd.h> #include <string.h> #include <device/dram/ddr2.h> diff --git a/src/security/intel/txt/romstage.c b/src/security/intel/txt/romstage.c index e045c9d..fb29fa0 100644 --- a/src/security/intel/txt/romstage.c +++ b/src/security/intel/txt/romstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/mmio.h> #include <console/console.h> #include <cpu/intel/common/common.h> diff --git a/src/soc/amd/cezanne/romstage.c b/src/soc/amd/cezanne/romstage.c index dce0b69..2c55dcb 100644 --- a/src/soc/amd/cezanne/romstage.c +++ b/src/soc/amd/cezanne/romstage.c @@ -4,7 +4,7 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <fsp/api.h> #include <program_loading.h> diff --git a/src/soc/amd/common/block/acpi/cppc.c b/src/soc/amd/common/block/acpi/cppc.c index ce40057..81a09b4 100644 --- a/src/soc/amd/common/block/acpi/cppc.c +++ b/src/soc/amd/common/block/acpi/cppc.c @@ -3,7 +3,7 @@ #include <acpi/acpi_pm.h> #include <acpi/acpigen.h> #include <amdblocks/cppc.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <soc/msr.h> #include <types.h>
diff --git a/src/soc/amd/common/block/cpu/cpu.c b/src/soc/amd/common/block/cpu/cpu.c index bece89b..402fff0 100644 --- a/src/soc/amd/common/block/cpu/cpu.c +++ b/src/soc/amd/common/block/cpu/cpu.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <amdblocks/cpu.h>
int get_cpu_count(void) diff --git a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c index d539161..9be9e0d 100644 --- a/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c +++ b/src/soc/amd/common/block/cpu/noncar/write_resume_eip.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <amdblocks/cpu.h> #include <cpu/amd/msr.h> #include <cpu/x86/msr.h> diff --git a/src/soc/amd/common/block/cpu/update_microcode.c b/src/soc/amd/common/block/cpu/update_microcode.c index 79aaaf5..afcfedc 100644 --- a/src/soc/amd/common/block/cpu/update_microcode.c +++ b/src/soc/amd/common/block/cpu/update_microcode.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <types.h> #include <cpu/amd/microcode.h> #include <commonlib/helpers.h> diff --git a/src/soc/amd/glinda/romstage.c b/src/soc/amd/glinda/romstage.c index dce0b69..2c55dcb 100644 --- a/src/soc/amd/glinda/romstage.c +++ b/src/soc/amd/glinda/romstage.c @@ -4,7 +4,7 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <fsp/api.h> #include <program_loading.h> diff --git a/src/soc/amd/mendocino/romstage.c b/src/soc/amd/mendocino/romstage.c index dfec897..3f91390 100644 --- a/src/soc/amd/mendocino/romstage.c +++ b/src/soc/amd/mendocino/romstage.c @@ -7,7 +7,7 @@ #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> #include <amdblocks/stb.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <fsp/api.h> #include <program_loading.h> diff --git a/src/soc/amd/morgana/romstage.c b/src/soc/amd/morgana/romstage.c index dce0b69..2c55dcb 100644 --- a/src/soc/amd/morgana/romstage.c +++ b/src/soc/amd/morgana/romstage.c @@ -4,7 +4,7 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <fsp/api.h> #include <program_loading.h> diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 35eedcb..19a43ad 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -3,7 +3,7 @@ #include <acpi/acpi.h> #include <acpi/acpi_crat.h> #include <acpi/acpi_ivrs.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <cpu/amd/cpuid.h> #include <cpu/amd/msr.h> #include <FspGuids.h> diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c index ccb11f0..1884149 100644 --- a/src/soc/amd/picasso/romstage.c +++ b/src/soc/amd/picasso/romstage.c @@ -3,7 +3,7 @@ #include <acpi/acpi.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <commonlib/helpers.h> #include <console/console.h> #include <fsp/api.h> diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c index c82416e..8d5d5e1 100644 --- a/src/soc/amd/picasso/soc_util.c +++ b/src/soc/amd/picasso/soc_util.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <FspGuids.h> #include <fsp/util.h> diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 7d1124a..349d8d4 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -6,7 +6,7 @@ #include <amdblocks/agesawrapper_call.h> #include <amdblocks/biosram.h> #include <amdblocks/psp.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/romstage.h> #include <cbmem.h> #include <commonlib/helpers.h> diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c index edc3ca8..073c8a7 100644 --- a/src/soc/intel/alderlake/bootblock/report_platform.c +++ b/src/soc/intel/alderlake/bootblock/report_platform.c @@ -6,7 +6,7 @@ * Chapter number: 2, 14 */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <commonlib/helpers.h> #include <console/console.h> diff --git a/src/soc/intel/alderlake/bootblock/update_descriptor.c b/src/soc/intel/alderlake/bootblock/update_descriptor.c index dbb152c..c64d0c5 100644 --- a/src/soc/intel/alderlake/bootblock/update_descriptor.c +++ b/src/soc/intel/alderlake/bootblock/update_descriptor.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/mmio.h> #include <cf9_reset.h> #include <commonlib/region.h> diff --git a/src/soc/intel/apollolake/report_platform.c b/src/soc/intel/apollolake/report_platform.c index 31a6458..d419c11 100644 --- a/src/soc/intel/apollolake/report_platform.c +++ b/src/soc/intel/apollolake/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c index 26de1cb..24ff941 100644 --- a/src/soc/intel/baytrail/ramstage.c +++ b/src/soc/intel/baytrail/ramstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <acpi/acpi_gnvs.h> #include <acpi/acpi_pm.h> #include <bootstate.h> diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index 1dffd2d..a2d07dc 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <acpi/acpi_pm.h> #include <console/console.h> #include <cpu/intel/microcode.h> diff --git a/src/soc/intel/broadwell/report_platform.c b/src/soc/intel/broadwell/report_platform.c index 7e044be..3fe3a91 100644 --- a/src/soc/intel/broadwell/report_platform.c +++ b/src/soc/intel/broadwell/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <device/pci.h> diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c index fe36271..f93b22f 100644 --- a/src/soc/intel/cannonlake/bootblock/report_platform.c +++ b/src/soc/intel/cannonlake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 99cf23f..1a6d26e 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -2,7 +2,7 @@
#include <acpi/acpi_pm.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> diff --git a/src/soc/intel/common/block/acpi/sgx.c b/src/soc/intel/common/block/acpi/sgx.c index 7d9073d..7e17acf 100644 --- a/src/soc/intel/common/block/acpi/sgx.c +++ b/src/soc/intel/common/block/acpi/sgx.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.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 4898066..cb5335a 100644 --- a/src/soc/intel/common/block/cpu/cpulib.c +++ b/src/soc/intel/common/block/cpu/cpulib.c @@ -7,7 +7,7 @@ #include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> -#include <arch/cpu.h> +#include <cpu/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 1d30a8d..18ff506 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <bootstate.h> #include <console/console.h> #include <cbfs.h> diff --git a/src/soc/intel/common/block/timer/timer.c b/src/soc/intel/common/block/timer/timer.c index 0d201a5..88d1bf2 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>
diff --git a/src/soc/intel/elkhartlake/bootblock/report_platform.c b/src/soc/intel/elkhartlake/bootblock/report_platform.c index cc3462d..f9fddb0 100644 --- a/src/soc/intel/elkhartlake/bootblock/report_platform.c +++ b/src/soc/intel/elkhartlake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> #include <cpu/intel/microcode.h> diff --git a/src/soc/intel/icelake/bootblock/report_platform.c b/src/soc/intel/icelake/bootblock/report_platform.c index 2188009..2fc6b32 100644 --- a/src/soc/intel/icelake/bootblock/report_platform.c +++ b/src/soc/intel/icelake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/jasperlake/bootblock/report_platform.c b/src/soc/intel/jasperlake/bootblock/report_platform.c index 0d2fe43..537f863 100644 --- a/src/soc/intel/jasperlake/bootblock/report_platform.c +++ b/src/soc/intel/jasperlake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/meteorlake/bootblock/report_platform.c b/src/soc/intel/meteorlake/bootblock/report_platform.c index 72d0d83..48bad8e 100644 --- a/src/soc/intel/meteorlake/bootblock/report_platform.c +++ b/src/soc/intel/meteorlake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/meteorlake/cpu.c b/src/soc/intel/meteorlake/cpu.c index 00caaa5..afbd246 100644 --- a/src/soc/intel/meteorlake/cpu.c +++ b/src/soc/intel/meteorlake/cpu.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <device/pci.h> #include <cpu/x86/lapic.h> diff --git a/src/soc/intel/quark/include/soc/ramstage.h b/src/soc/intel/quark/include/soc/ramstage.h index d54a74a..3002322f 100644 --- a/src/soc/intel/quark/include/soc/ramstage.h +++ b/src/soc/intel/quark/include/soc/ramstage.h @@ -3,7 +3,7 @@ #ifndef _SOC_RAMSTAGE_H_ #define _SOC_RAMSTAGE_H_
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/device.h> #include <soc/QuarkNcSocId.h>
diff --git a/src/soc/intel/quark/romstage/report_platform.c b/src/soc/intel/quark/romstage/report_platform.c index ab5b0d1..30c297a 100644 --- a/src/soc/intel/quark/romstage/report_platform.c +++ b/src/soc/intel/quark/romstage/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <device/pci.h> #include <device/pci_ops.h> diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 9ae0bb6..96fef55 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -4,7 +4,7 @@ #include <acpi/acpi_gnvs.h> #include <acpi/acpi_pm.h> #include <acpi/acpigen.h> -#include <arch/cpu.h> +#include <cpu/cpu.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <console/console.h> diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c index 3cfac5e..7fc82e8 100644 --- a/src/soc/intel/skylake/bootblock/report_platform.c +++ b/src/soc/intel/skylake/bootblock/report_platform.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c index af7a96a..e21cea4 100644 --- a/src/soc/intel/tigerlake/bootblock/report_platform.c +++ b/src/soc/intel/tigerlake/bootblock/report_platform.c @@ -6,7 +6,7 @@ * Chapter number: 2, 4, 5, 6 */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/intel/cpu_ids.h> diff --git a/src/soc/intel/tigerlake/lpm.c b/src/soc/intel/tigerlake/lpm.c index 0dd725a..62a5798 100644 --- a/src/soc/intel/tigerlake/lpm.c +++ b/src/soc/intel/tigerlake/lpm.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/device.h> #include <device/pci_ops.h> #include <device/pci_ids.h> diff --git a/src/soc/samsung/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c index 13e9489..ab24fe0 100644 --- a/src/soc/samsung/exynos5420/smp.c +++ b/src/soc/samsung/exynos5420/smp.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <device/mmio.h> #include <soc/cpu.h> #include <soc/power.h> diff --git a/src/southbridge/intel/ibexpeak/early_cir.c b/src/southbridge/intel/ibexpeak/early_cir.c index c0f9437..20c4d2b 100644 --- a/src/southbridge/intel/ibexpeak/early_cir.c +++ b/src/southbridge/intel/ibexpeak/early_cir.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> +#include <cpu/cpu.h> #include <console/console.h> #include <device/pci_ops.h> #include <device/pci_def.h>