Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69033 )
Change subject: soc/amd: Include <cpu/cpu.h> instead of <arch/cpu.h> ......................................................................
soc/amd: Include <cpu/cpu.h> instead of <arch/cpu.h>
Also sort includes.
Change-Id: Iea29938623fe1b2bcdd7f869b0accbc1f8758e7a Signed-off-by: Elyes Haouas ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/69033 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Held felix-coreboot@felixheld.de --- 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 12 files changed, 43 insertions(+), 28 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/soc/amd/cezanne/romstage.c b/src/soc/amd/cezanne/romstage.c index dce0b69..b843bff 100644 --- a/src/soc/amd/cezanne/romstage.c +++ b/src/soc/amd/cezanne/romstage.c @@ -4,8 +4,8 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <program_loading.h> #include <romstage_common.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..7c1daf9 100644 --- a/src/soc/amd/common/block/cpu/cpu.c +++ b/src/soc/amd/common/block/cpu/cpu.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> #include <amdblocks/cpu.h> +#include <cpu/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..5863917 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,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h> -#include <arch/cpu.h> #include <amdblocks/cpu.h> #include <cpu/amd/msr.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <stdint.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..cfffbc0 100644 --- a/src/soc/amd/common/block/cpu/update_microcode.c +++ b/src/soc/amd/common/block/cpu/update_microcode.c @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> -#include <types.h> -#include <cpu/amd/microcode.h> +#include <cbfs.h> #include <commonlib/helpers.h> #include <console/console.h> -#include <cpu/x86/msr.h> +#include <cpu/amd/microcode.h> #include <cpu/amd/msr.h> -#include <cbfs.h> +#include <cpu/cpu.h> +#include <cpu/x86/msr.h> #include <stdio.h> #include <timestamp.h> +#include <types.h>
#define CPU_MICROCODE_BLOB_NAME "cpu_microcode_XXXX.bin" #define CPU_MICROCODE_BLOB_FORMAT "cpu_microcode_%04x.bin" diff --git a/src/soc/amd/glinda/romstage.c b/src/soc/amd/glinda/romstage.c index dce0b69..b843bff 100644 --- a/src/soc/amd/glinda/romstage.c +++ b/src/soc/amd/glinda/romstage.c @@ -4,8 +4,8 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <program_loading.h> #include <romstage_common.h> diff --git a/src/soc/amd/mendocino/romstage.c b/src/soc/amd/mendocino/romstage.c index dfec897..3548a79 100644 --- a/src/soc/amd/mendocino/romstage.c +++ b/src/soc/amd/mendocino/romstage.c @@ -7,8 +7,8 @@ #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> #include <amdblocks/stb.h> -#include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <program_loading.h> #include <romstage_common.h> diff --git a/src/soc/amd/morgana/romstage.c b/src/soc/amd/morgana/romstage.c index dce0b69..b843bff 100644 --- a/src/soc/amd/morgana/romstage.c +++ b/src/soc/amd/morgana/romstage.c @@ -4,8 +4,8 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> #include <console/console.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <program_loading.h> #include <romstage_common.h> diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 35eedcb..839d7c0 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -1,24 +1,24 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <acpi/acpi.h> #include <acpi/acpi_crat.h> #include <acpi/acpi_ivrs.h> -#include <arch/cpu.h> -#include <cpu/amd/cpuid.h> -#include <cpu/amd/msr.h> -#include <FspGuids.h> -#include <soc/acpi.h> -#include <stdint.h> -#include <device/device.h> -#include <device/pci_def.h> -#include <device/pci_ops.h> +#include <acpi/acpi.h> #include <amdblocks/acpi.h> #include <amdblocks/cpu.h> #include <amdblocks/data_fabric.h> #include <amdblocks/ioapic.h> +#include <arch/mmio.h> +#include <cpu/amd/cpuid.h> +#include <cpu/amd/msr.h> +#include <cpu/cpu.h> +#include <device/device.h> +#include <device/pci_def.h> +#include <device/pci_ops.h> +#include <FspGuids.h> +#include <soc/acpi.h> #include <soc/data_fabric.h> #include <soc/pci_devs.h> -#include <arch/mmio.h> +#include <stdint.h>
static unsigned long gen_crat_hsa_entry(struct acpi_crat_header *crat, unsigned long current) { diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c index ccb11f0..9958af2 100644 --- a/src/soc/amd/picasso/romstage.c +++ b/src/soc/amd/picasso/romstage.c @@ -3,9 +3,9 @@ #include <acpi/acpi.h> #include <amdblocks/memmap.h> #include <amdblocks/pmlib.h> -#include <arch/cpu.h> #include <commonlib/helpers.h> #include <console/console.h> +#include <cpu/cpu.h> #include <fsp/api.h> #include <program_loading.h> #include <romstage_common.h> diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c index c82416e..9616f26 100644 --- a/src/soc/amd/picasso/soc_util.c +++ b/src/soc/amd/picasso/soc_util.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/cpu.h> #include <console/console.h> -#include <FspGuids.h> +#include <cpu/cpu.h> #include <fsp/util.h> +#include <FspGuids.h> #include <misc_data.h> #include <soc/cpu.h> #include <soc/soc_util.h> diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 7d1124a..54fc51e 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -2,16 +2,16 @@
#include <acpi/acpi.h> #include <amdblocks/acpi.h> -#include <amdblocks/agesawrapper.h> #include <amdblocks/agesawrapper_call.h> +#include <amdblocks/agesawrapper.h> #include <amdblocks/biosram.h> #include <amdblocks/psp.h> -#include <arch/cpu.h> #include <arch/romstage.h> #include <cbmem.h> #include <commonlib/helpers.h> #include <console/console.h> #include <cpu/amd/mtrr.h> +#include <cpu/cpu.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/smm.h>