Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69038 )
Change subject: {device,drivers}:Include <cpu/cpu.h> instead of <arch/cpu.h> ......................................................................
{device,drivers}:Include <cpu/cpu.h> instead of <arch/cpu.h>
Also sort includes.
Change-Id: I1727bf56b4090d040aab413006dec7aca0587d44 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- 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 5 files changed, 21 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/69038/1
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..5c3d904 100644 --- a/src/drivers/amd/agesa/romstage.c +++ b/src/drivers/amd/agesa/romstage.c @@ -1,21 +1,21 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/biosram.h> #include <acpi/acpi.h> -#include <arch/cpu.h> +#include <amdblocks/biosram.h> #include <arch/romstage.h> #include <cbmem.h> #include <console/console.h> +#include <cpu/cpu.h> #include <cpu/x86/lapic.h> #include <halt.h> +#include <northbridge/amd/agesa/agesa_helper.h> +#include <northbridge/amd/agesa/state_machine.h> #include <program_loading.h> +#include <romstage_common.h> #include <romstage_handoff.h> #include <smp/node.h> #include <string.h> #include <timestamp.h> -#include <romstage_common.h> -#include <northbridge/amd/agesa/agesa_helper.h> -#include <northbridge/amd/agesa/state_machine.h>
void __weak board_BeforeAgesa(struct sysinfo *cb) { }
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>