diff options
Diffstat (limited to 'src/soc')
109 files changed, 128 insertions, 128 deletions
diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c index 9d8da6e4a372..105d77b0f6d2 100644 --- a/src/soc/amd/common/block/acpi/acpi.c +++ b/src/soc/amd/common/block/acpi/acpi.c @@ -3,7 +3,7 @@ #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootmode.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 6715a4329682..a3f8a969e66a 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* This file is part of the coreboot project. */ -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c index 2028f0933561..00a5aea97750 100644 --- a/src/soc/amd/common/block/hda/hda.c +++ b/src/soc/amd/common/block/hda/hda.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <amdblocks/hda.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 71e29cdd22fe..3304f93e7feb 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -10,7 +10,7 @@ #define MMIO_ACPI_PM1_STS 0x00 #define MMIO_ACPI_PM1_EN 0x02 #define MMIO_ACPI_PM1_CNT_BLK 0x04 - /* sleep types defined in arch/x86/include/arch/acpi.h */ + /* sleep types defined in arch/x86/include/acpi/acpi.h */ #define ACPI_PM1_CNT_SCIEN BIT(0) #define MMIO_ACPI_PM_TMR_BLK 0x08 #define MMIO_ACPI_CPU_CONTROL 0x0c diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c index 2d7954fba24d..8d4ff6c449da 100644 --- a/src/soc/amd/common/block/pi/agesawrapper.c +++ b/src/soc/amd/common/block/pi/agesawrapper.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/console.h> #include <timestamp.h> diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c index 6cdae6b5ab40..663f1e76293c 100644 --- a/src/soc/amd/common/block/pi/amd_late_init.c +++ b/src/soc/amd/common/block/pi/amd_late_init.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/amd/common/block/pi/refcode_loader.c b/src/soc/amd/common/block/pi/refcode_loader.c index 191e79903ed4..5221b7486a33 100644 --- a/src/soc/amd/common/block/pi/refcode_loader.c +++ b/src/soc/amd/common/block/pi/refcode_loader.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbfs.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index 1959d3d8604d..b4954c881812 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 8e34c85f5248..357dbcacb8d5 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -7,8 +7,8 @@ #include <string.h> #include <console/console.h> -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/pci_ops.h> #include <arch/ioapic.h> #include <cpu/x86/smm.h> diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h index 7c6823239c99..c206b2e05475 100644 --- a/src/soc/amd/picasso/chip.h +++ b/src/soc/amd/picasso/chip.h @@ -11,7 +11,7 @@ #include <soc/i2c.h> #include <soc/iomap.h> #include <soc/southbridge.h> -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> struct soc_amd_picasso_config { /* @@ -33,7 +33,7 @@ struct soc_amd_picasso_config { I2S_PINS_UNCONF = 7, /* All pads will be input mode */ } acp_pin_cfg; - /* Options for these are in src/arch/x86/include/arch/acpi.h */ + /* Options for these are in src/arch/x86/include/acpi/acpi.h */ uint8_t fadt_pm_profile; uint16_t fadt_boot_arch; uint32_t fadt_flags; diff --git a/src/soc/amd/picasso/finalize.c b/src/soc/amd/picasso/finalize.c index 09e9b6b4b4ff..15af741ea1b1 100644 --- a/src/soc/amd/picasso/finalize.c +++ b/src/soc/amd/picasso/finalize.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/mp.h> #include <cpu/x86/msr.h> #include <cpu/amd/msr.h> diff --git a/src/soc/amd/picasso/i2c.c b/src/soc/amd/picasso/i2c.c index 25dab397c0f4..454d0c228331 100644 --- a/src/soc/amd/picasso/i2c.c +++ b/src/soc/amd/picasso/i2c.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <device/mmio.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h index 68321fffaec0..c90ce468f186 100644 --- a/src/soc/amd/picasso/include/soc/acpi.h +++ b/src/soc/amd/picasso/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef __SOC_PICASSO_ACPI_H__ #define __SOC_PICASSO_ACPI_H__ -#include <arch/acpi.h> +#include <acpi/acpi.h> #ifndef FADT_PM_PROFILE #define FADT_PM_PROFILE PM_UNSPECIFIED diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c index cdea0058a84a..64e61c04e81d 100644 --- a/src/soc/amd/picasso/mca.c +++ b/src/soc/amd/picasso/mca.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <cpu/x86/msr.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/cpu.h> #include <soc/northbridge.h> #include <console/console.h> diff --git a/src/soc/amd/picasso/northbridge.c b/src/soc/amd/picasso/northbridge.c index 35d46bcfb60f..0f484d22b67a 100644 --- a/src/soc/amd/picasso/northbridge.c +++ b/src/soc/amd/picasso/northbridge.c @@ -4,8 +4,8 @@ #include <amdblocks/biosram.h> #include <device/pci_ops.h> #include <arch/ioapic.h> -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <cbmem.h> #include <console/console.h> #include <cpu/amd/mtrr.h> diff --git a/src/soc/amd/picasso/pmutil.c b/src/soc/amd/picasso/pmutil.c index a38acf246163..1db9d00a5de8 100644 --- a/src/soc/amd/picasso/pmutil.c +++ b/src/soc/amd/picasso/pmutil.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/southbridge.h> #include <amdblocks/acpimmio.h> #include <security/vboot/vboot_common.h> diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c index 329429ef48c5..8af5821ef245 100644 --- a/src/soc/amd/picasso/romstage.c +++ b/src/soc/amd/picasso/romstage.c @@ -3,7 +3,7 @@ #include <arch/cpu.h> #include <arch/romstage.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/cache.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c index d399c7d230b4..cf04c2eace8e 100644 --- a/src/soc/amd/picasso/smihandler.c +++ b/src/soc/amd/picasso/smihandler.c @@ -6,7 +6,7 @@ #include <cpu/x86/smm.h> #include <cpu/x86/cache.h> #include <cpu/amd/amd64_save_state.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/hlt.h> #include <device/pci_def.h> #include <smmstore.h> diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index cc9f634959d2..15b48583fede 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -7,8 +7,8 @@ #include <string.h> #include <console/console.h> -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/pci_ops.h> #include <arch/ioapic.h> #include <cpu/x86/smm.h> diff --git a/src/soc/amd/stoneyridge/chip.h b/src/soc/amd/stoneyridge/chip.h index 22c8cc6547fc..ad89df437f89 100644 --- a/src/soc/amd/stoneyridge/chip.h +++ b/src/soc/amd/stoneyridge/chip.h @@ -9,7 +9,7 @@ #include <commonlib/helpers.h> #include <drivers/i2c/designware/dw_i2c.h> #include <soc/i2c.h> -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> #define MAX_NODES 1 #if CONFIG(AMD_APU_MERLINFALCON) diff --git a/src/soc/amd/stoneyridge/finalize.c b/src/soc/amd/stoneyridge/finalize.c index 09e9b6b4b4ff..15af741ea1b1 100644 --- a/src/soc/amd/stoneyridge/finalize.c +++ b/src/soc/amd/stoneyridge/finalize.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/mp.h> #include <cpu/x86/msr.h> #include <cpu/amd/msr.h> diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c index 852930a88d6c..5206b405373d 100644 --- a/src/soc/amd/stoneyridge/i2c.c +++ b/src/soc/amd/stoneyridge/i2c.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <device/mmio.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/soc/amd/stoneyridge/include/soc/acpi.h b/src/soc/amd/stoneyridge/include/soc/acpi.h index 6a74f22f58b3..95477489b6a8 100644 --- a/src/soc/amd/stoneyridge/include/soc/acpi.h +++ b/src/soc/amd/stoneyridge/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef __SOC_STONEYRIDGE_ACPI_H__ #define __SOC_STONEYRIDGE_ACPI_H__ -#include <arch/acpi.h> +#include <acpi/acpi.h> #if CONFIG(STONEYRIDGE_LEGACY_FREE) #define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE diff --git a/src/soc/amd/stoneyridge/mca.c b/src/soc/amd/stoneyridge/mca.c index 44f43b471707..14559b9b99a8 100644 --- a/src/soc/amd/stoneyridge/mca.c +++ b/src/soc/amd/stoneyridge/mca.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <cpu/x86/msr.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/cpu.h> #include <soc/northbridge.h> #include <console/console.h> diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 2aa16b6853f6..135abefe91c5 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -6,8 +6,8 @@ #include <amdblocks/hda.h> #include <device/pci_ops.h> #include <arch/ioapic.h> -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <cbmem.h> #include <console/console.h> #include <cpu/amd/mtrr.h> diff --git a/src/soc/amd/stoneyridge/pmutil.c b/src/soc/amd/stoneyridge/pmutil.c index a38acf246163..1db9d00a5de8 100644 --- a/src/soc/amd/stoneyridge/pmutil.c +++ b/src/soc/amd/stoneyridge/pmutil.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/southbridge.h> #include <amdblocks/acpimmio.h> #include <security/vboot/vboot_common.h> diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c index 9c3154107af8..131a268993df 100644 --- a/src/soc/amd/stoneyridge/romstage.c +++ b/src/soc/amd/stoneyridge/romstage.c @@ -5,7 +5,7 @@ #include <device/pci_ops.h> #include <arch/cpu.h> #include <arch/romstage.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/smm.h> diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c index 2b8afa7a8872..6e5e79bded6e 100644 --- a/src/soc/amd/stoneyridge/smihandler.c +++ b/src/soc/amd/stoneyridge/smihandler.c @@ -6,7 +6,7 @@ #include <cpu/x86/smm.h> #include <cpu/x86/cache.h> #include <cpu/amd/amd64_save_state.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/hlt.h> #include <device/pci_def.h> #include <smmstore.h> diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index 93c8792c3ee6..944d8536466d 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -13,8 +13,8 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <console/console.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index c4e068d41fcc..0b2de52fbb2d 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index 73f5614852f3..1e60683b378a 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <assert.h> #include <console/console.h> #include "chip.h" diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c index e375f409f534..3b41d73a180d 100644 --- a/src/soc/intel/apollolake/graphics.c +++ b/src/soc/intel/apollolake/graphics.c @@ -14,7 +14,7 @@ */ #include <stdint.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootmode.h> #include <console/console.h> #include <fsp/util.h> diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h index b3ee7a0d4967..207d1ef6d840 100644 --- a/src/soc/intel/apollolake/include/soc/pm.h +++ b/src/soc/intel/apollolake/include/soc/pm.h @@ -17,7 +17,7 @@ #define _SOC_APOLLOLAKE_PM_H_ #include <stdint.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c index 3d0d4593ddf7..4a33b6c63e52 100644 --- a/src/soc/intel/apollolake/pmutil.c +++ b/src/soc/intel/apollolake/pmutil.c @@ -15,7 +15,7 @@ #define __SIMPLE_DEVICE__ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <device/mmio.h> #include <cbmem.h> diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 426c2de95acd..eb94d39f5904 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c index dc9855ddf868..06534d06ab44 100644 --- a/src/soc/intel/baytrail/ehci.c +++ b/src/soc/intel/baytrail/ehci.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/baytrail/elog.c b/src/soc/intel/baytrail/elog.c index 1401649552c2..6ce90a4b5a21 100644 --- a/src/soc/intel/baytrail/elog.c +++ b/src/soc/intel/baytrail/elog.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <stdint.h> #include <console/console.h> #include <cbmem.h> diff --git a/src/soc/intel/baytrail/include/soc/acpi.h b/src/soc/intel/baytrail/include/soc/acpi.h index 3da67ebf76db..842049a283dd 100644 --- a/src/soc/intel/baytrail/include/soc/acpi.h +++ b/src/soc/intel/baytrail/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef _BAYTRAIL_ACPI_H_ #define _BAYTRAIL_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> void acpi_fill_in_fadt(acpi_fadt_t *fadt); diff --git a/src/soc/intel/baytrail/include/soc/pmc.h b/src/soc/intel/baytrail/include/soc/pmc.h index 0161f6703876..274e7a75b656 100644 --- a/src/soc/intel/baytrail/include/soc/pmc.h +++ b/src/soc/intel/baytrail/include/soc/pmc.h @@ -4,7 +4,7 @@ #ifndef _BAYTRAIL_PMC_H_ #define _BAYTRAIL_PMC_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #define IOCOM1 0x3f8 diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c index d83be9f8266d..64d528f1cbc3 100644 --- a/src/soc/intel/baytrail/northcluster.c +++ b/src/soc/intel/baytrail/northcluster.c @@ -6,7 +6,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <vendorcode/google/chromeos/chromeos.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <stddef.h> #include <soc/iomap.h> #include <soc/iosf.h> diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index aa56a2ebb2dd..e815a9730de8 100644 --- a/src/soc/intel/baytrail/pmutil.c +++ b/src/soc/intel/baytrail/pmutil.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <stdint.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <bootmode.h> #include <device/device.h> diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c index 9036e103fc30..7147f184499c 100644 --- a/src/soc/intel/baytrail/ramstage.c +++ b/src/soc/intel/baytrail/ramstage.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <arch/cpu.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/console.h> #include <cpu/intel/microcode.h> diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c index 5f6dce875f0d..39803dea4efa 100644 --- a/src/soc/intel/baytrail/refcode.c +++ b/src/soc/intel/baytrail/refcode.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/console.h> #include <console/streams.h> diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c index 3ebf8fff2a67..68b8c0e0bb42 100644 --- a/src/soc/intel/baytrail/romstage/raminit.c +++ b/src/soc/intel/baytrail/romstage/raminit.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <stddef.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <assert.h> #include <cbfs.h> #include <cbmem.h> diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 3f83e08a4ca5..7f651b30eef8 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -5,7 +5,7 @@ #include <arch/io.h> #include <device/mmio.h> #include <device/pci_ops.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> @@ -26,7 +26,7 @@ #include <soc/ramstage.h> #include <soc/spi.h> #include "chip.h" -#include <arch/acpigen.h> +#include <acpi/acpigen.h> static inline void add_mmio_resource(struct device *dev, int i, unsigned long addr, diff --git a/src/soc/intel/baytrail/xhci.c b/src/soc/intel/baytrail/xhci.c index 473be2fcc3e9..347c79641474 100644 --- a/src/soc/intel/baytrail/xhci.c +++ b/src/soc/intel/baytrail/xhci.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 1c9d6b3e9bb2..0954e58c95ae 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/braswell/elog.c b/src/soc/intel/braswell/elog.c index 615117c61303..6f35d064dd23 100644 --- a/src/soc/intel/braswell/elog.c +++ b/src/soc/intel/braswell/elog.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/console.h> #include <device/device.h> diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h index 997b7e920c58..ef476456aff8 100644 --- a/src/soc/intel/braswell/include/soc/acpi.h +++ b/src/soc/intel/braswell/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef _SOC_ACPI_H_ #define _SOC_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> void acpi_create_serialio_ssdt(acpi_header_t *ssdt); diff --git a/src/soc/intel/braswell/include/soc/pm.h b/src/soc/intel/braswell/include/soc/pm.h index f3397aaa4b6c..2ca2b5d1b1a5 100644 --- a/src/soc/intel/braswell/include/soc/pm.h +++ b/src/soc/intel/braswell/include/soc/pm.h @@ -4,7 +4,7 @@ #ifndef _SOC_PM_H_ #define _SOC_PM_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #define IOCOM1 0x3f8 diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c index 3222faf814f6..5dca249e0bc7 100644 --- a/src/soc/intel/braswell/northcluster.c +++ b/src/soc/intel/braswell/northcluster.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <cpu/x86/smm.h> #include <device/device.h> diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 1ca8bdaccc51..aaa6e480f95a 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/src/soc/intel/braswell/pmutil.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <assert.h> #include <bootmode.h> diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index e2d9a3b1012f..5d6ecab8c405 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <arch/cpu.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 9b5784c2b5f0..14c42022dc7d 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/src/soc/intel/braswell/southcluster.c @@ -4,7 +4,7 @@ #include <arch/io.h> #include <device/mmio.h> #include <device/pci_ops.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/ioapic.h> #include <bootstate.h> #include "chip.h" diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c index 503e1799b57e..8afdba158acd 100644 --- a/src/soc/intel/broadwell/acpi.c +++ b/src/soc/intel/broadwell/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <arch/smp/mpspec.h> #include <cbmem.h> #include <device/pci_ops.h> diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index b030d44c3990..294fbdef9d00 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/src/soc/intel/broadwell/igd.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <bootmode.h> diff --git a/src/soc/intel/broadwell/include/soc/acpi.h b/src/soc/intel/broadwell/include/soc/acpi.h index 2d39707f780a..049393c9a561 100644 --- a/src/soc/intel/broadwell/include/soc/acpi.h +++ b/src/soc/intel/broadwell/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef _BROADWELL_ACPI_H_ #define _BROADWELL_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> /* P-state configuration */ diff --git a/src/soc/intel/broadwell/include/soc/pm.h b/src/soc/intel/broadwell/include/soc/pm.h index ea6beb15f127..5f512b8d4ec5 100644 --- a/src/soc/intel/broadwell/include/soc/pm.h +++ b/src/soc/intel/broadwell/include/soc/pm.h @@ -4,7 +4,7 @@ #ifndef _BROADWELL_PM_H_ #define _BROADWELL_PM_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> /* ACPI_BASE_ADDRESS / PMBASE */ diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c index af3be9e13269..4b4969ccb4ab 100644 --- a/src/soc/intel/broadwell/lpc.c +++ b/src/soc/intel/broadwell/lpc.c @@ -11,7 +11,7 @@ #include <arch/io.h> #include <device/pci_ops.h> #include <arch/ioapic.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/smm.h> #include <cbmem.h> #include <reg_script.h> @@ -27,7 +27,7 @@ #include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/intel/broadwell/chip.h> -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <southbridge/intel/common/rtc.h> static void pch_enable_ioapic(struct device *dev) diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/me.c index afe9c827051f..e6f3849f03b5 100644 --- a/src/soc/intel/broadwell/me.c +++ b/src/soc/intel/broadwell/me.c @@ -9,7 +9,7 @@ * not used unless the console loglevel is high enough. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pmutil.c index 910df6179587..cecac7fe4b2e 100644 --- a/src/soc/intel/broadwell/pmutil.c +++ b/src/soc/intel/broadwell/pmutil.c @@ -6,7 +6,7 @@ * and the differences between PCH variants. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <bootmode.h> #include <device/pci_ops.h> diff --git a/src/soc/intel/broadwell/ramstage.c b/src/soc/intel/broadwell/ramstage.c index a0c6e4f49735..2849d3c25481 100644 --- a/src/soc/intel/broadwell/ramstage.c +++ b/src/soc/intel/broadwell/ramstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <device/device.h> #include <string.h> diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c index f54a4947a2ab..8c0b726bd381 100644 --- a/src/soc/intel/broadwell/refcode.c +++ b/src/soc/intel/broadwell/refcode.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <string.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/console.h> #include <console/streams.h> diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c index 8b5dc0cc60bb..ac1008b2b191 100644 --- a/src/soc/intel/broadwell/systemagent.c +++ b/src/soc/intel/broadwell/systemagent.c @@ -2,7 +2,7 @@ /* This file is part of the coreboot project. */ #include <console/console.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/pci_ops.h> #include <stdint.h> #include <delay.h> diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c index 2eb82a20a835..10fa9214b992 100644 --- a/src/soc/intel/broadwell/xhci.c +++ b/src/soc/intel/broadwell/xhci.c @@ -5,7 +5,7 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <soc/ramstage.h> diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index 39f3fe1de684..5604186c117f 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <arch/smp/mpspec.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c index 1ecbb670984b..57270b428b43 100644 --- a/src/soc/intel/cannonlake/graphics.c +++ b/src/soc/intel/cannonlake/graphics.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootmode.h> #include <console/console.h> #include <fsp/util.h> diff --git a/src/soc/intel/cannonlake/include/soc/pm.h b/src/soc/intel/cannonlake/include/soc/pm.h index 7d4fcc39c9e2..4068ea10e9bb 100644 --- a/src/soc/intel/cannonlake/include/soc/pm.h +++ b/src/soc/intel/cannonlake/include/soc/pm.h @@ -127,7 +127,7 @@ #if !defined(__ACPI__) -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> #include <soc/smbus.h> diff --git a/src/soc/intel/common/acpi_wake_source.c b/src/soc/intel/common/acpi_wake_source.c index 9ac03c99ad41..eac68ab9c23d 100644 --- a/src/soc/intel/common/acpi_wake_source.c +++ b/src/soc/intel/common/acpi_wake_source.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index e426fae95e38..905032fa77d3 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <bootstate.h> diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c index 4e28b44740d1..d3e109f93628 100644 --- a/src/soc/intel/common/block/cpu/cpulib.c +++ b/src/soc/intel/common/block/cpu/cpulib.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <console/console.h> #include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> diff --git a/src/soc/intel/common/block/include/intelblocks/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi.h index cb10f1f10d77..2d0fecf3b06d 100644 --- a/src/soc/intel/common/block/include/intelblocks/acpi.h +++ b/src/soc/intel/common/block/include/intelblocks/acpi.h @@ -16,7 +16,7 @@ #ifndef SOC_INTEL_COMMON_BLOCK_ACPI_H #define SOC_INTEL_COMMON_BLOCK_ACPI_H -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/device.h> #include <intelblocks/cpulib.h> #include <stdint.h> diff --git a/src/soc/intel/common/block/include/intelblocks/sd.h b/src/soc/intel/common/block/include/intelblocks/sd.h index d0a160de29ea..25ce24235492 100644 --- a/src/soc/intel/common/block/include/intelblocks/sd.h +++ b/src/soc/intel/common/block/include/intelblocks/sd.h @@ -4,7 +4,7 @@ #ifndef SOC_INTEL_COMMON_BLOCK_SD_H #define SOC_INTEL_COMMON_BLOCK_SD_H -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> /* * Fill the GPIO Interrupt or I/O information that will be used for the diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index d466e3684bf2..c7a70e6fc7e9 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <device/pci_ops.h> #include <console/console.h> diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index 9a0387b49334..731c50b1957b 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -439,7 +439,7 @@ int platform_is_resuming(void) return acpi_sleep_from_pm1(pmc_read_pm1_control()) == ACPI_S3; } -/* Read and clear GPE status (defined in arch/acpi.h) */ +/* Read and clear GPE status (defined in acpi/acpi.h) */ int acpi_get_gpe(int gpe) { int bank; diff --git a/src/soc/intel/common/block/scs/early_mmc.c b/src/soc/intel/common/block/scs/early_mmc.c index 00946b304df6..57f39f02e34a 100644 --- a/src/soc/intel/common/block/scs/early_mmc.c +++ b/src/soc/intel/common/block/scs/early_mmc.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <commonlib/storage/sd_mmc.h> #include <commonlib/sd_mmc_ctrlr.h> diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index 8e44738da5e3..be7fd2033f00 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <device/pci.h> #include <device/pci_ids.h> #include <intelblocks/sd.h> diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 9498060c5e11..3c607e5ab625 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cbmem.h> #include <console/uart.h> #include <device/device.h> diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index c293f8ab08f5..bab2c0f436d9 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> #include <console/console.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/soc/intel/common/tpm_tis.c b/src/soc/intel/common/tpm_tis.c index 77262b603696..bb0aea0c984b 100644 --- a/src/soc/intel/common/tpm_tis.c +++ b/src/soc/intel/common/tpm_tis.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <security/tpm/tis.h> int tis_plat_irq_status(void) diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c index 5b21018b6c3a..845a8ce0cd2e 100644 --- a/src/soc/intel/common/vbt.c +++ b/src/soc/intel/common/vbt.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootmode.h> #include <bootstate.h> diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c index 6f432884579e..1d4bcfc5201a 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <arch/smp/mpspec.h> #include <cpu/x86/smm.h> #include <string.h> diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c index fbe2b8264fb8..16175e7317a2 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <bootstate.h> #include <cbfs.h> #include <console/console.h> diff --git a/src/soc/intel/denverton_ns/include/soc/acpi.h b/src/soc/intel/denverton_ns/include/soc/acpi.h index ae184e92b075..b9edfea63c5a 100644 --- a/src/soc/intel/denverton_ns/include/soc/acpi.h +++ b/src/soc/intel/denverton_ns/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef _DENVERTON_NS_ACPI_H_ #define _DENVERTON_NS_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> void acpi_create_serialio_ssdt(acpi_header_t *ssdt); diff --git a/src/soc/intel/denverton_ns/include/soc/pm.h b/src/soc/intel/denverton_ns/include/soc/pm.h index 9e03c03432a0..04d0fccf0ead 100644 --- a/src/soc/intel/denverton_ns/include/soc/pm.h +++ b/src/soc/intel/denverton_ns/include/soc/pm.h @@ -5,7 +5,7 @@ #define _DENVERTON_NS_PM_H_ #include <soc/pmc.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #define GPE_MAX 127 diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index b1f045a821f0..e976b8d772c3 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/src/soc/intel/denverton_ns/lpc.c @@ -9,7 +9,7 @@ #include <device/mmio.h> #include <device/pci_ops.h> #include <arch/ioapic.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <cpu/x86/smm.h> #include <bootstate.h> diff --git a/src/soc/intel/denverton_ns/pmc.c b/src/soc/intel/denverton_ns/pmc.c index 2ba4531debcf..d868d3eef2b6 100644 --- a/src/soc/intel/denverton_ns/pmc.c +++ b/src/soc/intel/denverton_ns/pmc.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <arch/io.h> #include <device/pci_ops.h> #include <console/console.h> diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index ca74ab3b0866..5bc4ff21a6d3 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/src/soc/intel/icelake/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/icelake/graphics.c b/src/soc/intel/icelake/graphics.c index b8192c95b63d..175b3ceefaa5 100644 --- a/src/soc/intel/icelake/graphics.c +++ b/src/soc/intel/icelake/graphics.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <fsp/util.h> #include <device/device.h> diff --git a/src/soc/intel/icelake/include/soc/pm.h b/src/soc/intel/icelake/include/soc/pm.h index cb59a21b7b3d..be7198fdfac6 100644 --- a/src/soc/intel/icelake/include/soc/pm.h +++ b/src/soc/intel/icelake/include/soc/pm.h @@ -127,7 +127,7 @@ #if !defined(__ACPI__) -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> #include <soc/smbus.h> diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c index b390968708cb..6db6ec8440d5 100644 --- a/src/soc/intel/jasperlake/acpi.c +++ b/src/soc/intel/jasperlake/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/jasperlake/graphics.c b/src/soc/intel/jasperlake/graphics.c index b8192c95b63d..175b3ceefaa5 100644 --- a/src/soc/intel/jasperlake/graphics.c +++ b/src/soc/intel/jasperlake/graphics.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <fsp/util.h> #include <device/device.h> diff --git a/src/soc/intel/jasperlake/include/soc/pm.h b/src/soc/intel/jasperlake/include/soc/pm.h index f1da3a81f411..10a658658d1f 100644 --- a/src/soc/intel/jasperlake/include/soc/pm.h +++ b/src/soc/intel/jasperlake/include/soc/pm.h @@ -127,7 +127,7 @@ #if !defined(__ACPI__) -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> #include <soc/smbus.h> diff --git a/src/soc/intel/quark/include/soc/acpi.h b/src/soc/intel/quark/include/soc/acpi.h index 1b8dfa0b3dad..6dccc3044a04 100644 --- a/src/soc/intel/quark/include/soc/acpi.h +++ b/src/soc/intel/quark/include/soc/acpi.h @@ -4,8 +4,8 @@ #ifndef _SOC_ACPI_H_ #define _SOC_ACPI_H_ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> void acpi_fill_in_fadt(acpi_fadt_t *fadt); diff --git a/src/soc/intel/quark/include/soc/pm.h b/src/soc/intel/quark/include/soc/pm.h index 2c0df5eaf417..4ce4cb5058cf 100644 --- a/src/soc/intel/quark/include/soc/pm.h +++ b/src/soc/intel/quark/include/soc/pm.h @@ -5,7 +5,7 @@ #define _SOC_PM_H_ #include <stdint.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> struct chipset_power_state { uint32_t prev_sleep_state; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 5ba683f47b2e..789af1d9e6ae 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <arch/cpu.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index 9df078bad8f4..b731baff8db8 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -5,7 +5,7 @@ #include <bootstate.h> #include <cbmem.h> #include <fsp/api.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <device/device.h> #include <device/pci_ids.h> diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 892f26212ba7..387bd6fe3d9c 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -5,7 +5,7 @@ #ifndef _SOC_CHIP_H_ #define _SOC_CHIP_H_ -#include <arch/acpi_device.h> +#include <acpi/acpi_device.h> #include <device/i2c_simple.h> #include <drivers/i2c/designware/dw_i2c.h> #include <drivers/intel/gma/i915.h> diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h index f63220e13bfb..9b0369773d89 100644 --- a/src/soc/intel/skylake/include/soc/acpi.h +++ b/src/soc/intel/skylake/include/soc/acpi.h @@ -4,7 +4,7 @@ #ifndef _SOC_ACPI_H_ #define _SOC_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> /* P-state configuration */ diff --git a/src/soc/intel/skylake/include/soc/pm.h b/src/soc/intel/skylake/include/soc/pm.h index 94b8d3e447e3..083783f3462c 100644 --- a/src/soc/intel/skylake/include/soc/pm.h +++ b/src/soc/intel/skylake/include/soc/pm.h @@ -4,7 +4,7 @@ #ifndef _SOC_PM_H_ #define _SOC_PM_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/mmio.h> #include <soc/gpe.h> #include <soc/iomap.h> diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c index 649cb25b587d..f9dfa8b2b55d 100644 --- a/src/soc/intel/skylake/pmutil.c +++ b/src/soc/intel/skylake/pmutil.c @@ -6,7 +6,7 @@ * and the differences between PCH variants. */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <device/mmio.h> #include <device/pci_ops.h> #include <device/device.h> diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index a331b722a74b..58c8e9ccf1e1 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpi.h> -#include <arch/acpigen.h> +#include <acpi/acpi.h> +#include <acpi/acpigen.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/tigerlake/graphics.c b/src/soc/intel/tigerlake/graphics.c index eaa07c394a55..bbf36ca6a3a7 100644 --- a/src/soc/intel/tigerlake/graphics.c +++ b/src/soc/intel/tigerlake/graphics.c @@ -19,7 +19,7 @@ * Chapter number: 4 */ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <console/console.h> #include <fsp/util.h> #include <device/device.h> diff --git a/src/soc/intel/tigerlake/include/soc/pm.h b/src/soc/intel/tigerlake/include/soc/pm.h index 3004b4a73293..c42e280ed1e4 100644 --- a/src/soc/intel/tigerlake/include/soc/pm.h +++ b/src/soc/intel/tigerlake/include/soc/pm.h @@ -133,7 +133,7 @@ #if !defined(__ACPI__) -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/gpe.h> #include <soc/iomap.h> #include <soc/smbus.h> diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 0fe471c558e7..6260c73eb1d8 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <arch/ioapic.h> #include <arch/smp/mpspec.h> #include <cbmem.h> diff --git a/src/soc/intel/xeon_sp/cpx/cpu.c b/src/soc/intel/xeon_sp/cpx/cpu.c index a7a4c54e7f81..f0b7ddf110fb 100644 --- a/src/soc/intel/xeon_sp/cpx/cpu.c +++ b/src/soc/intel/xeon_sp/cpx/cpu.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* This file is part of the coreboot project. */ -#include <arch/acpigen.h> -#include <arch/acpi.h> +#include <acpi/acpigen.h> +#include <acpi/acpi.h> #include <console/console.h> #include <cpu/cpu.h> #include <cpu/intel/microcode.h> diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c index 9c5c7495f236..98cdd99545c7 100644 --- a/src/soc/intel/xeon_sp/skx/acpi.c +++ b/src/soc/intel/xeon_sp/skx/acpi.c @@ -14,7 +14,7 @@ */ #include <assert.h> -#include <arch/acpigen.h> +#include <acpi/acpigen.h> #include <arch/smp/mpspec.h> #include <intelblocks/acpi.h> #include <device/pci.h> diff --git a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h index a34cd396986b..3d32cd104a5d 100644 --- a/src/soc/intel/xeon_sp/skx/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/skx/include/soc/acpi.h @@ -17,7 +17,7 @@ #ifndef _SOC_ACPI_H_ #define _SOC_ACPI_H_ -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/nvs.h> #define MEM_BLK_COUNT 0x140 diff --git a/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h b/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h index 8ba4b296889e..a27550c90cee 100644 --- a/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h +++ b/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h @@ -6,7 +6,7 @@ #include <hob_iiouds.h> #include <hob_memmap.h> -#include <arch/acpi.h> +#include <acpi/acpi.h> #include <soc/util.h> struct iiostack_resource { |