summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/acpi/acpi.c6
-rw-r--r--src/acpi/acpi_device.c6
-rw-r--r--src/acpi/acpi_pld.c4
-rw-r--r--src/acpi/acpigen.c2
-rw-r--r--src/acpi/acpigen_dsm.c4
-rw-r--r--src/acpi/acpigen_ps2_keybd.c6
-rw-r--r--src/acpi/sata.c4
-rw-r--r--src/arch/x86/acpi/debug.asl2
-rw-r--r--src/arch/x86/acpi_bert_storage.c2
-rw-r--r--src/arch/x86/acpi_s3.c2
-rw-r--r--src/arch/x86/ebda.c2
-rw-r--r--src/arch/x86/include/arch/bert_storage.h2
-rw-r--r--src/arch/x86/tables.c2
-rw-r--r--src/cpu/amd/agesa/family14/model_14_init.c2
-rw-r--r--src/cpu/amd/agesa/family15tn/model_15_init.c2
-rw-r--r--src/cpu/amd/agesa/family16kb/model_16_init.c2
-rw-r--r--src/cpu/intel/common/common_init.c2
-rw-r--r--src/cpu/intel/haswell/acpi.c4
-rw-r--r--src/cpu/intel/haswell/haswell_init.c2
-rw-r--r--src/cpu/intel/model_2065x/acpi.c4
-rw-r--r--src/cpu/intel/model_2065x/model_2065x_init.c2
-rw-r--r--src/cpu/intel/model_206ax/acpi.c4
-rw-r--r--src/cpu/intel/model_206ax/model_206ax_init.c2
-rw-r--r--src/cpu/intel/speedstep/acpi.c4
-rw-r--r--src/cpu/x86/backup_default_smm.c2
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c2
-rw-r--r--src/device/pci_device.c2
-rw-r--r--src/device/pci_rom.c2
-rw-r--r--src/drivers/amd/agesa/heapmanager.c2
-rw-r--r--src/drivers/amd/agesa/romstage.c2
-rw-r--r--src/drivers/amd/agesa/state_machine.c2
-rw-r--r--src/drivers/crb/tis.c2
-rw-r--r--src/drivers/elog/elog.c2
-rw-r--r--src/drivers/generic/adau7002/adau7002.c4
-rw-r--r--src/drivers/generic/bayhub/chip.h2
-rw-r--r--src/drivers/generic/generic/chip.h2
-rw-r--r--src/drivers/generic/generic/generic.c4
-rw-r--r--src/drivers/generic/gpio_keys/chip.h2
-rw-r--r--src/drivers/generic/gpio_keys/gpio_keys.c4
-rw-r--r--src/drivers/generic/gpio_regulator/chip.h2
-rw-r--r--src/drivers/generic/gpio_regulator/gpio_regulator.c4
-rw-r--r--src/drivers/generic/max98357a/chip.h2
-rw-r--r--src/drivers/generic/max98357a/max98357a.c4
-rw-r--r--src/drivers/gfx/generic/chip.h2
-rw-r--r--src/drivers/gfx/generic/generic.c2
-rw-r--r--src/drivers/i2c/da7219/chip.h2
-rw-r--r--src/drivers/i2c/da7219/da7219.c6
-rw-r--r--src/drivers/i2c/designware/dw_i2c.c2
-rw-r--r--src/drivers/i2c/generic/chip.h2
-rw-r--r--src/drivers/i2c/generic/generic.c4
-rw-r--r--src/drivers/i2c/hid/hid.c2
-rw-r--r--src/drivers/i2c/max98373/max98373.c6
-rw-r--r--src/drivers/i2c/max98927/max98927.c6
-rw-r--r--src/drivers/i2c/nau8825/chip.h2
-rw-r--r--src/drivers/i2c/nau8825/nau8825.c6
-rw-r--r--src/drivers/i2c/rt1011/rt1011.c6
-rw-r--r--src/drivers/i2c/rt5663/chip.h2
-rw-r--r--src/drivers/i2c/rt5663/rt5663.c6
-rw-r--r--src/drivers/i2c/sx9310/chip.h2
-rw-r--r--src/drivers/i2c/sx9310/sx9310.c4
-rw-r--r--src/drivers/i2c/tpm/chip.c4
-rw-r--r--src/drivers/i2c/tpm/chip.h2
-rw-r--r--src/drivers/intel/fsp1_1/raminit.c2
-rw-r--r--src/drivers/intel/fsp1_1/ramstage.c2
-rw-r--r--src/drivers/intel/fsp1_1/romstage.c2
-rw-r--r--src/drivers/intel/gma/acpi.c4
-rw-r--r--src/drivers/intel/gma/intel_ddi.c2
-rw-r--r--src/drivers/intel/gma/opregion.c2
-rw-r--r--src/drivers/intel/ish/ish.c4
-rw-r--r--src/drivers/intel/mipi_camera/camera.c6
-rw-r--r--src/drivers/ipmi/ipmi_kcs_ops.c4
-rw-r--r--src/drivers/lenovo/wacom.c4
-rw-r--r--src/drivers/net/chip.h2
-rw-r--r--src/drivers/net/r8168.c4
-rw-r--r--src/drivers/pc80/pc/keyboard.c2
-rw-r--r--src/drivers/pc80/rtc/mc146818rtc.c2
-rw-r--r--src/drivers/pc80/tpm/tis.c6
-rw-r--r--src/drivers/spi/acpi/acpi.c4
-rw-r--r--src/drivers/spi/acpi/chip.h2
-rw-r--r--src/drivers/tpm/tpm.c2
-rw-r--r--src/drivers/usb/acpi/chip.h6
-rw-r--r--src/drivers/usb/acpi/usb_acpi.c6
-rw-r--r--src/drivers/wifi/generic.c4
-rw-r--r--src/ec/google/chromeec/ec_acpi.c8
-rw-r--r--src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c4
-rw-r--r--src/ec/google/chromeec/smihandler.c2
-rw-r--r--src/ec/google/wilco/chip.c6
-rw-r--r--src/ec/google/wilco/smihandler.c2
-rw-r--r--src/ec/lenovo/h8/h8.c2
-rw-r--r--src/ec/lenovo/h8/ssdt.c2
-rw-r--r--src/include/acpi/acpi_pld.h2
-rw-r--r--src/include/acpi/acpigen.h6
-rw-r--r--src/include/device/azalia_device.h2
-rw-r--r--src/include/device/pci_rom.h2
-rw-r--r--src/lib/coreboot_table.c2
-rw-r--r--src/lib/hardwaremain.c2
-rw-r--r--src/lib/nhlt.c2
-rw-r--r--src/mainboard/51nb/x210/dsdt.asl2
-rw-r--r--src/mainboard/amd/gardenia/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/gardenia/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/gardenia/dsdt.asl2
-rw-r--r--src/mainboard/amd/inagua/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/inagua/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/inagua/acpi_tables.c2
-rw-r--r--src/mainboard/amd/inagua/dsdt.asl2
-rw-r--r--src/mainboard/amd/olivehill/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/olivehill/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/olivehill/acpi_tables.c2
-rw-r--r--src/mainboard/amd/olivehill/dsdt.asl2
-rw-r--r--src/mainboard/amd/padmelon/dsdt.asl2
-rw-r--r--src/mainboard/amd/padmelon/mainboard.c2
-rw-r--r--src/mainboard/amd/parmer/acpi_tables.c2
-rw-r--r--src/mainboard/amd/parmer/dsdt.asl2
-rw-r--r--src/mainboard/amd/persimmon/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/persimmon/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/persimmon/acpi_tables.c2
-rw-r--r--src/mainboard/amd/persimmon/dsdt.asl2
-rw-r--r--src/mainboard/amd/south_station/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/south_station/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/south_station/acpi_tables.c2
-rw-r--r--src/mainboard/amd/south_station/dsdt.asl2
-rw-r--r--src/mainboard/amd/thatcher/acpi/cpstate.asl2
-rw-r--r--src/mainboard/amd/thatcher/acpi_tables.c2
-rw-r--r--src/mainboard/amd/thatcher/dsdt.asl2
-rw-r--r--src/mainboard/amd/union_station/acpi/routing.asl2
-rw-r--r--src/mainboard/amd/union_station/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/amd/union_station/acpi_tables.c2
-rw-r--r--src/mainboard/amd/union_station/dsdt.asl2
-rw-r--r--src/mainboard/aopen/dxplplusu/acpi_tables.c2
-rw-r--r--src/mainboard/aopen/dxplplusu/dsdt.asl2
-rw-r--r--src/mainboard/aopen/dxplplusu/fadt.c2
-rw-r--r--src/mainboard/apple/macbook21/dsdt.asl2
-rw-r--r--src/mainboard/apple/macbook21/mainboard.c2
-rw-r--r--src/mainboard/apple/macbookair4_2/dsdt.asl2
-rw-r--r--src/mainboard/asrock/b75pro3-m/dsdt.asl2
-rw-r--r--src/mainboard/asrock/b85m_pro4/dsdt.asl2
-rw-r--r--src/mainboard/asrock/e350m1/acpi/routing.asl2
-rw-r--r--src/mainboard/asrock/e350m1/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/asrock/e350m1/acpi_tables.c2
-rw-r--r--src/mainboard/asrock/e350m1/dsdt.asl2
-rw-r--r--src/mainboard/asrock/g41c-gs/cstates.c2
-rw-r--r--src/mainboard/asrock/g41c-gs/dsdt.asl2
-rw-r--r--src/mainboard/asrock/h110m/dsdt.asl2
-rw-r--r--src/mainboard/asrock/h81m-hds/dsdt.asl2
-rw-r--r--src/mainboard/asrock/imb-a180/acpi/routing.asl2
-rw-r--r--src/mainboard/asrock/imb-a180/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/asrock/imb-a180/acpi_tables.c2
-rw-r--r--src/mainboard/asrock/imb-a180/dsdt.asl2
-rw-r--r--src/mainboard/asus/am1i-a/acpi_tables.c2
-rw-r--r--src/mainboard/asus/am1i-a/dsdt.asl2
-rw-r--r--src/mainboard/asus/f2a85-m/acpi/cpstate.asl2
-rw-r--r--src/mainboard/asus/f2a85-m/acpi_tables.c2
-rw-r--r--src/mainboard/asus/f2a85-m/dsdt.asl2
-rw-r--r--src/mainboard/asus/h61m-cs/dsdt.asl2
-rw-r--r--src/mainboard/asus/maximus_iv_gene-z/dsdt.asl2
-rw-r--r--src/mainboard/asus/p2b/acpi_tables.c2
-rw-r--r--src/mainboard/asus/p2b/dsdt.asl2
-rw-r--r--src/mainboard/asus/p5gc-mx/cstates.c2
-rw-r--r--src/mainboard/asus/p5gc-mx/dsdt.asl2
-rw-r--r--src/mainboard/asus/p5qc/cstates.c2
-rw-r--r--src/mainboard/asus/p5qc/dsdt.asl2
-rw-r--r--src/mainboard/asus/p5ql-em/acpi_tables.c2
-rw-r--r--src/mainboard/asus/p5ql-em/dsdt.asl2
-rw-r--r--src/mainboard/asus/p5qpl-am/cstates.c2
-rw-r--r--src/mainboard/asus/p5qpl-am/dsdt.asl2
-rw-r--r--src/mainboard/asus/p8h61-m_lx/dsdt.asl2
-rw-r--r--src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl2
-rw-r--r--src/mainboard/asus/p8h61-m_pro/dsdt.asl2
-rw-r--r--src/mainboard/asus/p8z77-m_pro/dsdt.asl2
-rw-r--r--src/mainboard/asus/p8z77-v_lx2/dsdt.asl2
-rw-r--r--src/mainboard/bap/ode_e20XX/acpi/routing.asl2
-rw-r--r--src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/bap/ode_e20XX/acpi_tables.c2
-rw-r--r--src/mainboard/bap/ode_e20XX/dsdt.asl2
-rw-r--r--src/mainboard/bap/ode_e21XX/acpi/routing.asl2
-rw-r--r--src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/bap/ode_e21XX/acpi_tables.c2
-rw-r--r--src/mainboard/bap/ode_e21XX/dsdt.asl2
-rw-r--r--src/mainboard/biostar/a68n_5200/acpi/routing.asl2
-rw-r--r--src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/biostar/a68n_5200/acpi_tables.c2
-rw-r--r--src/mainboard/biostar/a68n_5200/dsdt.asl2
-rw-r--r--src/mainboard/biostar/am1ml/acpi/routing.asl2
-rw-r--r--src/mainboard/biostar/am1ml/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/biostar/am1ml/acpi_tables.c2
-rw-r--r--src/mainboard/biostar/am1ml/dsdt.asl2
-rw-r--r--src/mainboard/compulab/intense_pc/dsdt.asl2
-rw-r--r--src/mainboard/elmex/pcm205400/acpi/routing.asl2
-rw-r--r--src/mainboard/elmex/pcm205400/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/elmex/pcm205400/acpi_tables.c2
-rw-r--r--src/mainboard/elmex/pcm205400/dsdt.asl2
-rw-r--r--src/mainboard/emulation/qemu-i440fx/acpi_tables.c2
-rw-r--r--src/mainboard/emulation/qemu-i440fx/dsdt.asl2
-rw-r--r--src/mainboard/emulation/qemu-i440fx/fw_cfg.c2
-rw-r--r--src/mainboard/emulation/qemu-q35/acpi_tables.c2
-rw-r--r--src/mainboard/emulation/qemu-q35/dsdt.asl2
-rw-r--r--src/mainboard/facebook/fbg1701/acpi_tables.c2
-rw-r--r--src/mainboard/facebook/fbg1701/dsdt.asl2
-rw-r--r--src/mainboard/facebook/monolith/dsdt.asl2
-rw-r--r--src/mainboard/foxconn/d41s/cstates.c2
-rw-r--r--src/mainboard/foxconn/d41s/dsdt.asl2
-rw-r--r--src/mainboard/foxconn/g41s-k/cstates.c2
-rw-r--r--src/mainboard/foxconn/g41s-k/dsdt.asl2
-rw-r--r--src/mainboard/getac/p470/acpi_tables.c2
-rw-r--r--src/mainboard/getac/p470/cstates.c2
-rw-r--r--src/mainboard/getac/p470/dsdt.asl2
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c2
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl2
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl2
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/cstates.c2
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl2
-rw-r--r--src/mainboard/gigabyte/ga-h61m-series/dsdt.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo/acpi/routing.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo/acpi_tables.c2
-rw-r--r--src/mainboard/gizmosphere/gizmo/dsdt.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/acpi/routing.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/acpi_tables.c2
-rw-r--r--src/mainboard/gizmosphere/gizmo2/dsdt.asl2
-rw-r--r--src/mainboard/google/auron/acpi_tables.c2
-rw-r--r--src/mainboard/google/auron/dsdt.asl2
-rw-r--r--src/mainboard/google/auron/ec.c2
-rw-r--r--src/mainboard/google/auron/smihandler.c2
-rw-r--r--src/mainboard/google/beltino/acpi_tables.c2
-rw-r--r--src/mainboard/google/beltino/dsdt.asl2
-rw-r--r--src/mainboard/google/beltino/mainboard.c2
-rw-r--r--src/mainboard/google/beltino/smihandler.c2
-rw-r--r--src/mainboard/google/butterfly/dsdt.asl2
-rw-r--r--src/mainboard/google/butterfly/early_init.c2
-rw-r--r--src/mainboard/google/butterfly/mainboard.c2
-rw-r--r--src/mainboard/google/cyan/acpi_tables.c2
-rw-r--r--src/mainboard/google/cyan/dsdt.asl2
-rw-r--r--src/mainboard/google/cyan/ec.c2
-rw-r--r--src/mainboard/google/cyan/smihandler.c2
-rw-r--r--src/mainboard/google/dedede/dsdt.asl2
-rw-r--r--src/mainboard/google/dedede/ec.c2
-rw-r--r--src/mainboard/google/dedede/mainboard.c2
-rw-r--r--src/mainboard/google/deltaur/chromeos.c2
-rw-r--r--src/mainboard/google/deltaur/dsdt.asl2
-rw-r--r--src/mainboard/google/deltaur/mainboard.c2
-rw-r--r--src/mainboard/google/deltaur/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/dragonegg/chromeos.c2
-rw-r--r--src/mainboard/google/dragonegg/dsdt.asl2
-rw-r--r--src/mainboard/google/dragonegg/ec.c2
-rw-r--r--src/mainboard/google/dragonegg/mainboard.c2
-rw-r--r--src/mainboard/google/drallion/chromeos.c2
-rw-r--r--src/mainboard/google/drallion/dsdt.asl2
-rw-r--r--src/mainboard/google/drallion/ramstage.c2
-rw-r--r--src/mainboard/google/eve/dsdt.asl2
-rw-r--r--src/mainboard/google/eve/ec.c2
-rw-r--r--src/mainboard/google/eve/mainboard.c2
-rw-r--r--src/mainboard/google/fizz/dsdt.asl2
-rw-r--r--src/mainboard/google/fizz/ec.c2
-rw-r--r--src/mainboard/google/fizz/mainboard.c2
-rw-r--r--src/mainboard/google/fizz/variants/karma/smihandler.c2
-rw-r--r--src/mainboard/google/glados/dsdt.asl2
-rw-r--r--src/mainboard/google/glados/ec.c2
-rw-r--r--src/mainboard/google/glados/mainboard.c2
-rw-r--r--src/mainboard/google/glados/smihandler.c2
-rw-r--r--src/mainboard/google/hatch/chromeos.c2
-rw-r--r--src/mainboard/google/hatch/dsdt.asl2
-rw-r--r--src/mainboard/google/hatch/ec.c2
-rw-r--r--src/mainboard/google/hatch/ramstage.c2
-rw-r--r--src/mainboard/google/hatch/variants/akemi/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/dratini/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/hatch/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/helios/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/jinlon/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/kindred/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/kohaku/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/mushu/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/nightfury/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/palkia/gpio.c2
-rw-r--r--src/mainboard/google/hatch/variants/stryke/gpio.c2
-rw-r--r--src/mainboard/google/jecht/acpi_tables.c2
-rw-r--r--src/mainboard/google/jecht/dsdt.asl2
-rw-r--r--src/mainboard/google/jecht/mainboard.c2
-rw-r--r--src/mainboard/google/jecht/smihandler.c2
-rw-r--r--src/mainboard/google/kahlee/dsdt.asl2
-rw-r--r--src/mainboard/google/kahlee/ec.c2
-rw-r--r--src/mainboard/google/kahlee/mainboard.c2
-rw-r--r--src/mainboard/google/kahlee/smihandler.c2
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl2
-rw-r--r--src/mainboard/google/link/dsdt.asl2
-rw-r--r--src/mainboard/google/link/early_init.c2
-rw-r--r--src/mainboard/google/link/ec.c2
-rw-r--r--src/mainboard/google/link/mainboard.c2
-rw-r--r--src/mainboard/google/link/mainboard_smi.c2
-rw-r--r--src/mainboard/google/octopus/dsdt.asl2
-rw-r--r--src/mainboard/google/octopus/ec.c2
-rw-r--r--src/mainboard/google/octopus/mainboard.c2
-rw-r--r--src/mainboard/google/octopus/smihandler.c2
-rw-r--r--src/mainboard/google/octopus/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/octopus/variants/bobba/variant.c2
-rw-r--r--src/mainboard/google/octopus/variants/dood/variant.c2
-rw-r--r--src/mainboard/google/octopus/variants/garg/variant.c2
-rw-r--r--src/mainboard/google/parrot/acpi_tables.c2
-rw-r--r--src/mainboard/google/parrot/dsdt.asl2
-rw-r--r--src/mainboard/google/parrot/early_init.c2
-rw-r--r--src/mainboard/google/parrot/ec.c2
-rw-r--r--src/mainboard/google/parrot/mainboard.c2
-rw-r--r--src/mainboard/google/poppy/chromeos.c2
-rw-r--r--src/mainboard/google/poppy/dsdt.asl2
-rw-r--r--src/mainboard/google/poppy/ec.c2
-rw-r--r--src/mainboard/google/poppy/mainboard.c2
-rw-r--r--src/mainboard/google/poppy/variants/nami/smihandler.c2
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/smihandler.c2
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/ec.c2
-rw-r--r--src/mainboard/google/rambi/acpi_tables.c2
-rw-r--r--src/mainboard/google/rambi/dsdt.asl2
-rw-r--r--src/mainboard/google/rambi/ec.c2
-rw-r--r--src/mainboard/google/rambi/mainboard.c2
-rw-r--r--src/mainboard/google/rambi/mainboard_smi.c2
-rw-r--r--src/mainboard/google/reef/dsdt.asl2
-rw-r--r--src/mainboard/google/reef/ec.c2
-rw-r--r--src/mainboard/google/reef/mainboard.c2
-rw-r--r--src/mainboard/google/reef/smihandler.c2
-rw-r--r--src/mainboard/google/reef/variants/coral/gpio.c2
-rw-r--r--src/mainboard/google/sarien/chromeos.c2
-rw-r--r--src/mainboard/google/sarien/dsdt.asl2
-rw-r--r--src/mainboard/google/sarien/ramstage.c2
-rw-r--r--src/mainboard/google/slippy/acpi_tables.c2
-rw-r--r--src/mainboard/google/slippy/dsdt.asl2
-rw-r--r--src/mainboard/google/slippy/ec.c2
-rw-r--r--src/mainboard/google/slippy/mainboard.c2
-rw-r--r--src/mainboard/google/slippy/smihandler.c2
-rw-r--r--src/mainboard/google/stout/acpi_tables.c2
-rw-r--r--src/mainboard/google/stout/dsdt.asl4
-rw-r--r--src/mainboard/google/stout/early_init.c2
-rw-r--r--src/mainboard/google/stout/ec.c2
-rw-r--r--src/mainboard/google/stout/mainboard.c2
-rw-r--r--src/mainboard/google/volteer/dsdt.asl2
-rw-r--r--src/mainboard/google/volteer/ec.c2
-rw-r--r--src/mainboard/google/volteer/mainboard.c2
-rw-r--r--src/mainboard/hp/abm/acpi/routing.asl2
-rw-r--r--src/mainboard/hp/abm/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/hp/abm/acpi_tables.c2
-rw-r--r--src/mainboard/hp/abm/dsdt.asl2
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/mainboard.c2
-rw-r--r--src/mainboard/hp/snb_ivb_laptops/dsdt.asl2
-rw-r--r--src/mainboard/hp/z220_sff_workstation/dsdt.asl2
-rw-r--r--src/mainboard/ibase/mb899/cstates.c2
-rw-r--r--src/mainboard/ibase/mb899/dsdt.asl2
-rw-r--r--src/mainboard/intel/apollolake_rvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/baskingridge/acpi_tables.c2
-rw-r--r--src/mainboard/intel/baskingridge/dsdt.asl2
-rw-r--r--src/mainboard/intel/baskingridge/mainboard.c2
-rw-r--r--src/mainboard/intel/baskingridge/mainboard_smi.c2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/chromeos.c2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/mainboard.c2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/smihandler.c2
-rw-r--r--src/mainboard/intel/cedarisland_crb/dsdt.asl2
-rw-r--r--src/mainboard/intel/coffeelake_rvp/chromeos.c2
-rw-r--r--src/mainboard/intel/coffeelake_rvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/coffeelake_rvp/mainboard.c2
-rw-r--r--src/mainboard/intel/d510mo/cstates.c2
-rw-r--r--src/mainboard/intel/d510mo/dsdt.asl2
-rw-r--r--src/mainboard/intel/d945gclf/cstates.c2
-rw-r--r--src/mainboard/intel/d945gclf/dsdt.asl2
-rw-r--r--src/mainboard/intel/dcp847ske/dsdt.asl2
-rw-r--r--src/mainboard/intel/dg41wv/cstates.c2
-rw-r--r--src/mainboard/intel/dg41wv/dsdt.asl2
-rw-r--r--src/mainboard/intel/dg43gt/cstates.c2
-rw-r--r--src/mainboard/intel/dg43gt/dsdt.asl2
-rw-r--r--src/mainboard/intel/emeraldlake2/acpi_tables.c2
-rw-r--r--src/mainboard/intel/emeraldlake2/dsdt.asl2
-rw-r--r--src/mainboard/intel/emeraldlake2/ec.c2
-rw-r--r--src/mainboard/intel/emeraldlake2/mainboard.c2
-rw-r--r--src/mainboard/intel/emeraldlake2/smihandler.c2
-rw-r--r--src/mainboard/intel/galileo/dsdt.asl2
-rw-r--r--src/mainboard/intel/glkrvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/glkrvp/ec.c2
-rw-r--r--src/mainboard/intel/glkrvp/mainboard.c2
-rw-r--r--src/mainboard/intel/glkrvp/smihandler.c2
-rw-r--r--src/mainboard/intel/harcuvar/acpi_tables.c2
-rw-r--r--src/mainboard/intel/harcuvar/dsdt.asl2
-rw-r--r--src/mainboard/intel/harcuvar/fadt.c2
-rw-r--r--src/mainboard/intel/icelake_rvp/chromeos.c2
-rw-r--r--src/mainboard/intel/icelake_rvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/icelake_rvp/mainboard.c2
-rw-r--r--src/mainboard/intel/jasperlake_rvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/kblrvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/kblrvp/ec.c2
-rw-r--r--src/mainboard/intel/kblrvp/mainboard.c2
-rw-r--r--src/mainboard/intel/kunimitsu/dsdt.asl2
-rw-r--r--src/mainboard/intel/kunimitsu/ec.c2
-rw-r--r--src/mainboard/intel/kunimitsu/mainboard.c2
-rw-r--r--src/mainboard/intel/kunimitsu/smihandler.c2
-rw-r--r--src/mainboard/intel/leafhill/dsdt.asl2
-rw-r--r--src/mainboard/intel/minnow3/dsdt.asl2
-rw-r--r--src/mainboard/intel/saddlebrook/dsdt.asl2
-rw-r--r--src/mainboard/intel/strago/acpi_tables.c2
-rw-r--r--src/mainboard/intel/strago/dsdt.asl2
-rw-r--r--src/mainboard/intel/strago/ec.c2
-rw-r--r--src/mainboard/intel/strago/smihandler.c2
-rw-r--r--src/mainboard/intel/tglrvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/wtm2/acpi_tables.c2
-rw-r--r--src/mainboard/intel/wtm2/dsdt.asl2
-rw-r--r--src/mainboard/intel/wtm2/mainboard.c2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/dsdt.asl2
-rw-r--r--src/mainboard/kontron/986lcd-m/cstates.c2
-rw-r--r--src/mainboard/kontron/986lcd-m/dsdt.asl2
-rw-r--r--src/mainboard/kontron/ktqm77/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/g505s/acpi_tables.c2
-rw-r--r--src/mainboard/lenovo/g505s/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/g505s/mainboard.c2
-rw-r--r--src/mainboard/lenovo/l520/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/s230u/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/s230u/mainboard.c2
-rw-r--r--src/mainboard/lenovo/t400/acpi_tables.c2
-rw-r--r--src/mainboard/lenovo/t400/cstates.c2
-rw-r--r--src/mainboard/lenovo/t400/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t400/fadt.c2
-rw-r--r--src/mainboard/lenovo/t410/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t410/mainboard.c2
-rw-r--r--src/mainboard/lenovo/t420/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t420s/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t430/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t430s/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t440p/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t520/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t530/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t60/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/t60/mainboard.c2
-rw-r--r--src/mainboard/lenovo/thinkcentre_a58/cstates.c2
-rw-r--r--src/mainboard/lenovo/thinkcentre_a58/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x131e/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x200/acpi_tables.c2
-rw-r--r--src/mainboard/lenovo/x200/cstates.c2
-rw-r--r--src/mainboard/lenovo/x200/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x200/fadt.c2
-rw-r--r--src/mainboard/lenovo/x201/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x220/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x220/early_init.c2
-rw-r--r--src/mainboard/lenovo/x230/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x60/dsdt.asl2
-rw-r--r--src/mainboard/lenovo/x60/mainboard.c2
-rw-r--r--src/mainboard/libretrend/lt1000/dsdt.asl2
-rw-r--r--src/mainboard/lippert/frontrunner-af/acpi/routing.asl2
-rw-r--r--src/mainboard/lippert/frontrunner-af/acpi/usb.asl2
-rw-r--r--src/mainboard/lippert/frontrunner-af/acpi_tables.c2
-rw-r--r--src/mainboard/lippert/frontrunner-af/dsdt.asl2
-rw-r--r--src/mainboard/lippert/toucan-af/acpi/routing.asl2
-rw-r--r--src/mainboard/lippert/toucan-af/acpi/usb.asl2
-rw-r--r--src/mainboard/lippert/toucan-af/acpi_tables.c2
-rw-r--r--src/mainboard/lippert/toucan-af/dsdt.asl2
-rw-r--r--src/mainboard/msi/ms7707/dsdt.asl2
-rw-r--r--src/mainboard/msi/ms7721/acpi/cpstate.asl2
-rw-r--r--src/mainboard/msi/ms7721/acpi_tables.c2
-rw-r--r--src/mainboard/msi/ms7721/dsdt.asl2
-rw-r--r--src/mainboard/ocp/sonorapass/dsdt.asl2
-rw-r--r--src/mainboard/ocp/tiogapass/dsdt.asl2
-rw-r--r--src/mainboard/ocp/tiogapass/fadt.c2
-rw-r--r--src/mainboard/packardbell/ms2290/dsdt.asl2
-rw-r--r--src/mainboard/pcengines/apu1/acpi/routing.asl2
-rw-r--r--src/mainboard/pcengines/apu1/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/pcengines/apu1/acpi_tables.c2
-rw-r--r--src/mainboard/pcengines/apu1/dsdt.asl2
-rw-r--r--src/mainboard/pcengines/apu2/acpi/routing.asl2
-rw-r--r--src/mainboard/pcengines/apu2/acpi/usb_oc.asl2
-rw-r--r--src/mainboard/pcengines/apu2/acpi_tables.c2
-rw-r--r--src/mainboard/pcengines/apu2/dsdt.asl2
-rw-r--r--src/mainboard/portwell/m107/acpi_tables.c2
-rw-r--r--src/mainboard/portwell/m107/dsdt.asl2
-rw-r--r--src/mainboard/protectli/vault_bsw/dsdt.asl2
-rw-r--r--src/mainboard/protectli/vault_kbl/dsdt.asl2
-rw-r--r--src/mainboard/purism/librem_bdw/acpi_tables.c2
-rw-r--r--src/mainboard/purism/librem_bdw/dsdt.asl2
-rw-r--r--src/mainboard/purism/librem_skl/dsdt.asl2
-rw-r--r--src/mainboard/razer/blade_stealth_kbl/dsdt.asl2
-rw-r--r--src/mainboard/roda/rk886ex/cstates.c2
-rw-r--r--src/mainboard/roda/rk886ex/dsdt.asl2
-rw-r--r--src/mainboard/roda/rk9/acpi_tables.c2
-rw-r--r--src/mainboard/roda/rk9/cstates.c2
-rw-r--r--src/mainboard/roda/rk9/dsdt.asl2
-rw-r--r--src/mainboard/roda/rk9/fadt.c2
-rw-r--r--src/mainboard/roda/rv11/dsdt.asl2
-rw-r--r--src/mainboard/samsung/lumpy/acpi_tables.c2
-rw-r--r--src/mainboard/samsung/lumpy/dsdt.asl2
-rw-r--r--src/mainboard/samsung/lumpy/ec.c2
-rw-r--r--src/mainboard/samsung/lumpy/mainboard.c2
-rw-r--r--src/mainboard/samsung/stumpy/acpi_tables.c2
-rw-r--r--src/mainboard/samsung/stumpy/dsdt.asl2
-rw-r--r--src/mainboard/samsung/stumpy/mainboard.c2
-rw-r--r--src/mainboard/samsung/stumpy/smihandler.c2
-rw-r--r--src/mainboard/sapphire/pureplatinumh61/dsdt.asl2
-rw-r--r--src/mainboard/scaleway/tagada/acpi_tables.c2
-rw-r--r--src/mainboard/scaleway/tagada/dsdt.asl2
-rw-r--r--src/mainboard/scaleway/tagada/fadt.c2
-rw-r--r--src/mainboard/siemens/mc_apl1/dsdt.asl2
-rw-r--r--src/mainboard/supermicro/x10slm-f/dsdt.asl2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/dsdt.asl2
-rw-r--r--src/mainboard/supermicro/x9scl/dsdt.asl2
-rw-r--r--src/mainboard/system76/lemp9/dsdt.asl2
-rw-r--r--src/mainboard/up/squared/dsdt.asl2
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c4
-rw-r--r--src/northbridge/amd/agesa/family15tn/northbridge.c4
-rw-r--r--src/northbridge/amd/agesa/family16kb/northbridge.c4
-rw-r--r--src/northbridge/amd/pi/00630F01/northbridge.c4
-rw-r--r--src/northbridge/amd/pi/00660F01/northbridge.c4
-rw-r--r--src/northbridge/amd/pi/00730F01/northbridge.c6
-rw-r--r--src/northbridge/intel/e7505/northbridge.c2
-rw-r--r--src/northbridge/intel/gm45/acpi.c4
-rw-r--r--src/northbridge/intel/gm45/northbridge.c2
-rw-r--r--src/northbridge/intel/gm45/romstage.c2
-rw-r--r--src/northbridge/intel/haswell/acpi.c2
-rw-r--r--src/northbridge/intel/haswell/northbridge.c2
-rw-r--r--src/northbridge/intel/i945/acpi.c4
-rw-r--r--src/northbridge/intel/i945/northbridge.c2
-rw-r--r--src/northbridge/intel/ironlake/northbridge.c2
-rw-r--r--src/northbridge/intel/pineview/acpi.c4
-rw-r--r--src/northbridge/intel/pineview/northbridge.c2
-rw-r--r--src/northbridge/intel/sandybridge/acpi.c2
-rw-r--r--src/northbridge/intel/sandybridge/northbridge.c2
-rw-r--r--src/northbridge/intel/x4x/acpi.c4
-rw-r--r--src/northbridge/intel/x4x/northbridge.c2
-rw-r--r--src/security/memory/memory_clear.c2
-rw-r--r--src/soc/amd/common/block/acpi/acpi.c2
-rw-r--r--src/soc/amd/common/block/graphics/graphics.c2
-rw-r--r--src/soc/amd/common/block/hda/hda.c2
-rw-r--r--src/soc/amd/common/block/include/amdblocks/acpi.h2
-rw-r--r--src/soc/amd/common/block/pi/agesawrapper.c2
-rw-r--r--src/soc/amd/common/block/pi/amd_late_init.c2
-rw-r--r--src/soc/amd/common/block/pi/refcode_loader.c2
-rw-r--r--src/soc/amd/common/block/sata/sata.c2
-rw-r--r--src/soc/amd/picasso/acpi.c4
-rw-r--r--src/soc/amd/picasso/chip.h4
-rw-r--r--src/soc/amd/picasso/finalize.c2
-rw-r--r--src/soc/amd/picasso/i2c.c2
-rw-r--r--src/soc/amd/picasso/include/soc/acpi.h2
-rw-r--r--src/soc/amd/picasso/mca.c2
-rw-r--r--src/soc/amd/picasso/northbridge.c4
-rw-r--r--src/soc/amd/picasso/pmutil.c2
-rw-r--r--src/soc/amd/picasso/romstage.c2
-rw-r--r--src/soc/amd/picasso/smihandler.c2
-rw-r--r--src/soc/amd/stoneyridge/acpi.c4
-rw-r--r--src/soc/amd/stoneyridge/chip.h2
-rw-r--r--src/soc/amd/stoneyridge/finalize.c2
-rw-r--r--src/soc/amd/stoneyridge/i2c.c2
-rw-r--r--src/soc/amd/stoneyridge/include/soc/acpi.h2
-rw-r--r--src/soc/amd/stoneyridge/mca.c2
-rw-r--r--src/soc/amd/stoneyridge/northbridge.c4
-rw-r--r--src/soc/amd/stoneyridge/pmutil.c2
-rw-r--r--src/soc/amd/stoneyridge/romstage.c2
-rw-r--r--src/soc/amd/stoneyridge/smihandler.c2
-rw-r--r--src/soc/intel/apollolake/acpi.c4
-rw-r--r--src/soc/intel/apollolake/chip.c2
-rw-r--r--src/soc/intel/apollolake/cpu.c2
-rw-r--r--src/soc/intel/apollolake/graphics.c2
-rw-r--r--src/soc/intel/apollolake/include/soc/pm.h2
-rw-r--r--src/soc/intel/apollolake/pmutil.c2
-rw-r--r--src/soc/intel/baytrail/acpi.c4
-rw-r--r--src/soc/intel/baytrail/ehci.c2
-rw-r--r--src/soc/intel/baytrail/elog.c2
-rw-r--r--src/soc/intel/baytrail/include/soc/acpi.h2
-rw-r--r--src/soc/intel/baytrail/include/soc/pmc.h2
-rw-r--r--src/soc/intel/baytrail/northcluster.c2
-rw-r--r--src/soc/intel/baytrail/pmutil.c2
-rw-r--r--src/soc/intel/baytrail/ramstage.c2
-rw-r--r--src/soc/intel/baytrail/refcode.c2
-rw-r--r--src/soc/intel/baytrail/romstage/raminit.c2
-rw-r--r--src/soc/intel/baytrail/southcluster.c4
-rw-r--r--src/soc/intel/baytrail/xhci.c2
-rw-r--r--src/soc/intel/braswell/acpi.c4
-rw-r--r--src/soc/intel/braswell/elog.c2
-rw-r--r--src/soc/intel/braswell/include/soc/acpi.h2
-rw-r--r--src/soc/intel/braswell/include/soc/pm.h2
-rw-r--r--src/soc/intel/braswell/northcluster.c2
-rw-r--r--src/soc/intel/braswell/pmutil.c2
-rw-r--r--src/soc/intel/braswell/ramstage.c2
-rw-r--r--src/soc/intel/braswell/southcluster.c2
-rw-r--r--src/soc/intel/broadwell/acpi.c4
-rw-r--r--src/soc/intel/broadwell/igd.c2
-rw-r--r--src/soc/intel/broadwell/include/soc/acpi.h2
-rw-r--r--src/soc/intel/broadwell/include/soc/pm.h2
-rw-r--r--src/soc/intel/broadwell/lpc.c4
-rw-r--r--src/soc/intel/broadwell/me.c2
-rw-r--r--src/soc/intel/broadwell/pmutil.c2
-rw-r--r--src/soc/intel/broadwell/ramstage.c2
-rw-r--r--src/soc/intel/broadwell/refcode.c2
-rw-r--r--src/soc/intel/broadwell/systemagent.c2
-rw-r--r--src/soc/intel/broadwell/xhci.c2
-rw-r--r--src/soc/intel/cannonlake/acpi.c4
-rw-r--r--src/soc/intel/cannonlake/graphics.c2
-rw-r--r--src/soc/intel/cannonlake/include/soc/pm.h2
-rw-r--r--src/soc/intel/common/acpi_wake_source.c2
-rw-r--r--src/soc/intel/common/block/acpi/acpi.c2
-rw-r--r--src/soc/intel/common/block/cpu/cpulib.c2
-rw-r--r--src/soc/intel/common/block/include/intelblocks/acpi.h2
-rw-r--r--src/soc/intel/common/block/include/intelblocks/sd.h2
-rw-r--r--src/soc/intel/common/block/pmc/pmc.c2
-rw-r--r--src/soc/intel/common/block/pmc/pmclib.c2
-rw-r--r--src/soc/intel/common/block/scs/early_mmc.c2
-rw-r--r--src/soc/intel/common/block/scs/sd.c2
-rw-r--r--src/soc/intel/common/block/uart/uart.c2
-rw-r--r--src/soc/intel/common/block/xhci/xhci.c2
-rw-r--r--src/soc/intel/common/tpm_tis.c2
-rw-r--r--src/soc/intel/common/vbt.c2
-rw-r--r--src/soc/intel/denverton_ns/acpi.c4
-rw-r--r--src/soc/intel/denverton_ns/chip.c2
-rw-r--r--src/soc/intel/denverton_ns/include/soc/acpi.h2
-rw-r--r--src/soc/intel/denverton_ns/include/soc/pm.h2
-rw-r--r--src/soc/intel/denverton_ns/lpc.c2
-rw-r--r--src/soc/intel/denverton_ns/pmc.c2
-rw-r--r--src/soc/intel/icelake/acpi.c4
-rw-r--r--src/soc/intel/icelake/graphics.c2
-rw-r--r--src/soc/intel/icelake/include/soc/pm.h2
-rw-r--r--src/soc/intel/jasperlake/acpi.c4
-rw-r--r--src/soc/intel/jasperlake/graphics.c2
-rw-r--r--src/soc/intel/jasperlake/include/soc/pm.h2
-rw-r--r--src/soc/intel/quark/include/soc/acpi.h4
-rw-r--r--src/soc/intel/quark/include/soc/pm.h2
-rw-r--r--src/soc/intel/skylake/acpi.c4
-rw-r--r--src/soc/intel/skylake/chip.c2
-rw-r--r--src/soc/intel/skylake/chip.h2
-rw-r--r--src/soc/intel/skylake/include/soc/acpi.h2
-rw-r--r--src/soc/intel/skylake/include/soc/pm.h2
-rw-r--r--src/soc/intel/skylake/pmutil.c2
-rw-r--r--src/soc/intel/tigerlake/acpi.c4
-rw-r--r--src/soc/intel/tigerlake/graphics.c2
-rw-r--r--src/soc/intel/tigerlake/include/soc/pm.h2
-rw-r--r--src/soc/intel/xeon_sp/cpx/acpi.c2
-rw-r--r--src/soc/intel/xeon_sp/cpx/cpu.c4
-rw-r--r--src/soc/intel/xeon_sp/skx/acpi.c2
-rw-r--r--src/soc/intel/xeon_sp/skx/include/soc/acpi.h2
-rw-r--r--src/soc/intel/xeon_sp/skx/include/soc/soc_util.h2
-rw-r--r--src/southbridge/amd/agesa/hudson/fadt.c2
-rw-r--r--src/southbridge/amd/agesa/hudson/lpc.c2
-rw-r--r--src/southbridge/amd/agesa/hudson/ramtop.c2
-rw-r--r--src/southbridge/amd/cimx/sb800/cfg.c2
-rw-r--r--src/southbridge/amd/cimx/sb800/fadt.c2
-rw-r--r--src/southbridge/amd/cimx/sb800/late.c2
-rw-r--r--src/southbridge/amd/cimx/sb800/ramtop.c2
-rw-r--r--src/southbridge/amd/pi/hudson/fadt.c2
-rw-r--r--src/southbridge/amd/pi/hudson/hudson.c2
-rw-r--r--src/southbridge/amd/pi/hudson/lpc.c2
-rw-r--r--src/southbridge/intel/bd82x6x/elog.c2
-rw-r--r--src/southbridge/intel/bd82x6x/lpc.c4
-rw-r--r--src/southbridge/intel/bd82x6x/me.c2
-rw-r--r--src/southbridge/intel/bd82x6x/me_8.x.c2
-rw-r--r--src/southbridge/intel/bd82x6x/pch.h2
-rw-r--r--src/southbridge/intel/common/acpi_pirq_gen.c2
-rw-r--r--src/southbridge/intel/common/madt.c2
-rw-r--r--src/southbridge/intel/common/pciehp.c4
-rw-r--r--src/southbridge/intel/common/pmbase.c2
-rw-r--r--src/southbridge/intel/common/pmclib.c2
-rw-r--r--src/southbridge/intel/common/smihandler.c2
-rw-r--r--src/southbridge/intel/i82371eb/acpi_tables.c4
-rw-r--r--src/southbridge/intel/i82371eb/fadt.c2
-rw-r--r--src/southbridge/intel/i82371eb/isa.c4
-rw-r--r--src/southbridge/intel/i82371eb/wakeup.c2
-rw-r--r--src/southbridge/intel/i82801dx/i82801dx.h2
-rw-r--r--src/southbridge/intel/i82801dx/smi.c2
-rw-r--r--src/southbridge/intel/i82801gx/lpc.c4
-rw-r--r--src/southbridge/intel/i82801ix/lpc.c4
-rw-r--r--src/southbridge/intel/i82801ix/smi.c2
-rw-r--r--src/southbridge/intel/i82801jx/lpc.c4
-rw-r--r--src/southbridge/intel/ibexpeak/lpc.c4
-rw-r--r--src/southbridge/intel/ibexpeak/madt.c2
-rw-r--r--src/southbridge/intel/ibexpeak/me.c2
-rw-r--r--src/southbridge/intel/ibexpeak/pch.h2
-rw-r--r--src/southbridge/intel/lynxpoint/acpi.c4
-rw-r--r--src/southbridge/intel/lynxpoint/elog.c2
-rw-r--r--src/southbridge/intel/lynxpoint/lpc.c4
-rw-r--r--src/southbridge/intel/lynxpoint/me_9.x.c2
-rw-r--r--src/southbridge/intel/lynxpoint/pch.h2
-rw-r--r--src/superio/aspeed/ast2400/superio.c2
-rw-r--r--src/superio/common/conf_mode.c2
-rw-r--r--src/superio/common/generic.c2
-rw-r--r--src/superio/common/ssdt.c4
-rw-r--r--src/superio/nuvoton/nct5539d/superio.c2
-rw-r--r--src/superio/nuvoton/nct5572d/superio.c2
-rw-r--r--src/superio/nuvoton/nct6791d/superio.c2
-rw-r--r--src/superio/nuvoton/npcd378/superio.c4
-rw-r--r--src/superio/winbond/w83667hg-a/superio.c2
-rw-r--r--src/vendorcode/eltan/security/mboot/mboot.h2
-rw-r--r--src/vendorcode/google/chromeos/acpi.c2
-rw-r--r--src/vendorcode/google/chromeos/elog.c2
688 files changed, 787 insertions, 787 deletions
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index 8e7b51d79d..d5b2c6b274 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -16,9 +16,9 @@
#include <console/console.h>
#include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_ivrs.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_ivrs.h>
+#include <acpi/acpigen.h>
#include <device/pci.h>
#include <cbmem.h>
#include <commonlib/helpers.h>
diff --git a/src/acpi/acpi_device.c b/src/acpi/acpi_device.c
index 9f63200121..6b067f3a0f 100644
--- a/src/acpi/acpi_device.c
+++ b/src/acpi/acpi_device.c
@@ -3,9 +3,9 @@
#include <assert.h>
#include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/path.h>
#include <stdlib.h>
diff --git a/src/acpi/acpi_pld.c b/src/acpi/acpi_pld.c
index 135009a243..a2d0dd7fe7 100644
--- a/src/acpi/acpi_pld.c
+++ b/src/acpi/acpi_pld.c
@@ -3,8 +3,8 @@
#include <stdint.h>
#include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_pld.h>
int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type,
struct acpi_pld_group *group)
diff --git a/src/acpi/acpigen.c b/src/acpi/acpigen.c
index dfc2a5adf4..a2dc84f799 100644
--- a/src/acpi/acpigen.c
+++ b/src/acpi/acpigen.c
@@ -13,7 +13,7 @@
#include <lib.h>
#include <string.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <assert.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/acpi/acpigen_dsm.c b/src/acpi/acpigen_dsm.c
index ecac3fefb8..b7b2a0bf18 100644
--- a/src/acpi/acpigen_dsm.c
+++ b/src/acpi/acpigen_dsm.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/acpigen_dsm.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_dsm.h>
/* ------------------- I2C HID DSM ---------------------------- */
diff --git a/src/acpi/acpigen_ps2_keybd.c b/src/acpi/acpigen_ps2_keybd.c
index 7943f9a158..be8d2eb999 100644
--- a/src/acpi/acpigen_ps2_keybd.c
+++ b/src/acpi/acpigen_ps2_keybd.c
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
-#include <arch/acpigen_ps2_keybd.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_ps2_keybd.h>
#include <console/console.h>
#include <input-event-codes.h>
diff --git a/src/acpi/sata.c b/src/acpi/sata.c
index f2b381124e..f2f53e6f64 100644
--- a/src/acpi/sata.c
+++ b/src/acpi/sata.c
@@ -3,8 +3,8 @@
#include "sata.h"
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
/* e.g.
* generate_sata_ssdt_ports("\_SB.PCI0.SATA", 0x3);
diff --git a/src/arch/x86/acpi/debug.asl b/src/arch/x86/acpi/debug.asl
index cde807c17f..2c1d2ce471 100644
--- a/src/arch/x86/acpi/debug.asl
+++ b/src/arch/x86/acpi/debug.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
- #include <arch/acpi.h>
+ #include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML",
"DSDT",
diff --git a/src/arch/x86/acpi_bert_storage.c b/src/arch/x86/acpi_bert_storage.c
index a7061fa7c5..c5f98f7ea8 100644
--- a/src/arch/x86/acpi_bert_storage.c
+++ b/src/arch/x86/acpi_bert_storage.c
@@ -7,7 +7,7 @@
#include <cpu/x86/name.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/bert_storage.h>
#include <string.h>
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index bf17980020..39e3a056cd 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 <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/cpu.h>
#include <cbmem.h>
#include <commonlib/helpers.h>
diff --git a/src/arch/x86/ebda.c b/src/arch/x86/ebda.c
index 4ac1359faa..99aa2d3f16 100644
--- a/src/arch/x86/ebda.c
+++ b/src/arch/x86/ebda.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/ebda.h>
#include <commonlib/endian.h>
#include <console/console.h>
diff --git a/src/arch/x86/include/arch/bert_storage.h b/src/arch/x86/include/arch/bert_storage.h
index 3e7b0b560c..d088f02ee9 100644
--- a/src/arch/x86/include/arch/bert_storage.h
+++ b/src/arch/x86/include/arch/bert_storage.h
@@ -5,7 +5,7 @@
#define _BERT_STORAGE_H_
#include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
/* Items in the BERT region
*
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 7e653f7245..3affd75761 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -8,7 +8,7 @@
#include <boot/coreboot_tables.h>
#include <arch/pirq_routing.h>
#include <arch/smp/mpspec.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <commonlib/helpers.h>
#include <string.h>
#include <cbmem.h>
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index c8a5a6298d..4bee724f16 100644
--- a/src/cpu/amd/agesa/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c
@@ -11,7 +11,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/cpu.h>
#include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/amd/agesa/agesa_helper.h>
static void model_14_init(struct device *dev)
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index 7279e8a358..f731990bed 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -12,7 +12,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/cpu.h>
#include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/amd/agesa/agesa_helper.h>
static void model_15_init(struct device *dev)
diff --git a/src/cpu/amd/agesa/family16kb/model_16_init.c b/src/cpu/amd/agesa/family16kb/model_16_init.c
index 67ce592523..e92e870d3a 100644
--- a/src/cpu/amd/agesa/family16kb/model_16_init.c
+++ b/src/cpu/amd/agesa/family16kb/model_16_init.c
@@ -11,7 +11,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/cpu.h>
#include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/amd/agesa/agesa_helper.h>
static void model_16_init(struct device *dev)
diff --git a/src/cpu/intel/common/common_init.c b/src/cpu/intel/common/common_init.c
index 0147a01447..c4ef6263f2 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 */
/* This file is part of the coreboot project. */
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index b3cc1e0d5b..423146176e 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
#include <cpu/intel/speedstep.h>
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index 82c28bfc22..c89bb830b3 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index a45f021ccb..692cc8036f 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
#include <cpu/intel/speedstep.h>
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index a642afdfd4..d856b3bac7 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -4,7 +4,7 @@
#include <assert.h>
#include <console/console.h>
#include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index d668f45f23..043e7facfe 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
#include <cpu/intel/speedstep.h>
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 4dfdc349b3..fabb6ba18b 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/cpu.h>
#include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 1d33640c8b..eead460460 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <cpu/x86/msr.h>
#include <cpu/intel/fsb.h>
diff --git a/src/cpu/x86/backup_default_smm.c b/src/cpu/x86/backup_default_smm.c
index 96650d608d..1875c3dc37 100644
--- a/src/cpu/x86/backup_default_smm.c
+++ b/src/cpu/x86/backup_default_smm.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 <console/console.h>
#include <cbmem.h>
#include <cpu/x86/smm.h>
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 6726f213d4..2c6960d9b6 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -5,7 +5,7 @@
#include <cpu/x86/gdt.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/smi_deprecated.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <delay.h>
#include <halt.h>
#include <lib.h>
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 02cb5addfb..6fce761a72 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -6,7 +6,7 @@
* PCI Bus Services, see include/linux/pci.h for further explanation.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/pci_ops.h>
#include <bootmode.h>
#include <console/console.h>
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 4fec2906d6..08bfec8178 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -10,7 +10,7 @@
#include <string.h>
#include <cbfs.h>
#include <cbmem.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
/* Rmodules don't like weak symbols. */
void __weak map_oprom_vendev_rev(u32 *vendev, u8 *rev) { return; }
diff --git a/src/drivers/amd/agesa/heapmanager.c b/src/drivers/amd/agesa/heapmanager.c
index 85f203c506..ea8abb52a5 100644
--- a/src/drivers/amd/agesa/heapmanager.c
+++ b/src/drivers/amd/agesa/heapmanager.c
@@ -9,7 +9,7 @@
#include <northbridge/amd/agesa/agesa_helper.h>
#include <northbridge/amd/agesa/BiosCallOuts.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <string.h>
diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c
index 6c90ac2a12..3652f8f80d 100644
--- a/src/drivers/amd/agesa/romstage.c
+++ b/src/drivers/amd/agesa/romstage.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <amdblocks/biosram.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/cpu.h>
#include <arch/romstage.h>
#include <cbmem.h>
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index a0d775295c..f9bf1fe2a9 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/src/drivers/amd/agesa/state_machine.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <bootstate.h>
#include <cbfs.h>
#include <cbmem.h>
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 0e97a07848..d34091121b 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <security/tpm/tis.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <drivers/intel/ptt/ptt.h>
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index ab86f387cc..3bc52dd70d 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
#include <bootstate.h>
#include <cbmem.h>
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index bf2f03de04..ddf6b7a93e 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/src/drivers/generic/adau7002/adau7002.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/drivers/generic/bayhub/chip.h b/src/drivers/generic/bayhub/chip.h
index 3a7b21d3e9..e4535b24c2 100644
--- a/src/drivers/generic/bayhub/chip.h
+++ b/src/drivers/generic/bayhub/chip.h
@@ -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>
/*
* Bayhub BG720 PCI to eMMC bridge
diff --git a/src/drivers/generic/generic/chip.h b/src/drivers/generic/generic/chip.h
index 41b5f461db..47b83a740e 100644
--- a/src/drivers/generic/generic/chip.h
+++ b/src/drivers/generic/generic/chip.h
@@ -6,7 +6,7 @@
#if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
#define MAX_GENERIC_PROPERTY_LIST 10
diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c
index eed824d375..00b9dda02c 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/src/drivers/generic/generic/generic.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/drivers/generic/gpio_keys/chip.h b/src/drivers/generic/gpio_keys/chip.h
index 9836abac60..e0ba3752d9 100644
--- a/src/drivers/generic/gpio_keys/chip.h
+++ b/src/drivers/generic/gpio_keys/chip.h
@@ -4,7 +4,7 @@
#ifndef __DRIVERS_GENERIC_GPIO_KEYS_H__
#define __DRIVERS_GENERIC_GPIO_KEYS_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
#include <stdint.h>
/* Linux input type */
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 1017f7a69f..732f02ad28 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/src/drivers/generic/gpio_keys/gpio_keys.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/path.h>
#include <string.h>
diff --git a/src/drivers/generic/gpio_regulator/chip.h b/src/drivers/generic/gpio_regulator/chip.h
index 8ae02ae3c2..f3d1d0f86a 100644
--- a/src/drivers/generic/gpio_regulator/chip.h
+++ b/src/drivers/generic/gpio_regulator/chip.h
@@ -4,7 +4,7 @@
#ifndef __DRIVERS_GENERIC_GPIO_REGULATOR_H__
#define __DRIVERS_GENERIC_GPIO_REGULATOR_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
struct drivers_generic_gpio_regulator_config {
const char *name;
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index 0ec1626da8..4eedb8bd7b 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/path.h>
#include <string.h>
diff --git a/src/drivers/generic/max98357a/chip.h b/src/drivers/generic/max98357a/chip.h
index 95a58f09d6..248311cc38 100644
--- a/src/drivers/generic/max98357a/chip.h
+++ b/src/drivers/generic/max98357a/chip.h
@@ -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>
struct drivers_generic_max98357a_config {
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index b9c270b0c5..52f08c69f7 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/drivers/gfx/generic/chip.h b/src/drivers/gfx/generic/chip.h
index 8e70bc6978..67843fdb42 100644
--- a/src/drivers/gfx/generic/chip.h
+++ b/src/drivers/gfx/generic/chip.h
@@ -4,7 +4,7 @@
#ifndef __DRIVERS_GFX_GENERIC_CHIP_H__
#define __DRIVERS_GFX_GENERIC_CHIP_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
/* Config for electronic privacy screen */
struct drivers_gfx_generic_privacy_screen_config {
diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c
index 4670b4d65f..2cbb17a06c 100644
--- a/src/drivers/gfx/generic/generic.c
+++ b/src/drivers/gfx/generic/generic.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 <device/device.h>
#include <device/pci.h>
diff --git a/src/drivers/i2c/da7219/chip.h b/src/drivers/i2c/da7219/chip.h
index 32d04dada1..9afce952c8 100644
--- a/src/drivers/i2c/da7219/chip.h
+++ b/src/drivers/i2c/da7219/chip.h
@@ -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>
/*
* Dialog Semiconductor DA7219 Audio Codec devicetree bindings
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 931c437546..3b122026a3 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/src/drivers/i2c/da7219/da7219.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/designware/dw_i2c.c b/src/drivers/i2c/designware/dw_i2c.c
index 74e24c7a53..dd5c17ce5a 100644
--- a/src/drivers/i2c/designware/dw_i2c.c
+++ b/src/drivers/i2c/designware/dw_i2c.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/mmio.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/generic/chip.h b/src/drivers/i2c/generic/chip.h
index e1f4472a44..a9a7082b12 100644
--- a/src/drivers/i2c/generic/chip.h
+++ b/src/drivers/i2c/generic/chip.h
@@ -4,7 +4,7 @@
#ifndef __I2C_GENERIC_CHIP_H__
#define __I2C_GENERIC_CHIP_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
#include <device/i2c_simple.h>
#define MAX_GENERIC_PROPERTY_LIST 10
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 7e709d6cc7..38fa3ebeb9 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index 4fac85874d..b588115275 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/src/drivers/i2c/hid/hid.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpigen_dsm.h>
+#include <acpi/acpigen_dsm.h>
#include <device/device.h>
#include <stdint.h>
#include <string.h>
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 067563868c..542dc98fb7 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/src/drivers/i2c/max98373/max98373.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index ddd9d152b0..0ea33d5f2b 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/src/drivers/i2c/max98927/max98927.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/nau8825/chip.h b/src/drivers/i2c/nau8825/chip.h
index 80d950ff71..3f17a5674b 100644
--- a/src/drivers/i2c/nau8825/chip.h
+++ b/src/drivers/i2c/nau8825/chip.h
@@ -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>
#define NAU8825_MAX_BUTTONS 8
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index fd9cfc9679..1d31f302f8 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index ec018cc38f..da8ad4eaf0 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/src/drivers/i2c/rt1011/rt1011.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/rt5663/chip.h b/src/drivers/i2c/rt5663/chip.h
index 6f7fbd87bb..ef498dba15 100644
--- a/src/drivers/i2c/rt5663/chip.h
+++ b/src/drivers/i2c/rt5663/chip.h
@@ -5,7 +5,7 @@
* Realtek RT5663 audio codec devicetree bindings
*/
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
#include <stdint.h>
struct drivers_i2c_rt5663_config {
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 67d8dea562..0573454b7d 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/src/drivers/i2c/rt5663/rt5663.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/sx9310/chip.h b/src/drivers/i2c/sx9310/chip.h
index b3820c80fc..bf4945b143 100644
--- a/src/drivers/i2c/sx9310/chip.h
+++ b/src/drivers/i2c/sx9310/chip.h
@@ -4,7 +4,7 @@
#ifndef __DRIVERS_I2C_SX9310_CHIP_H__
#define __DRIVERS_I2C_SX9310_CHIP_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
#include <device/i2c_simple.h>
#define REGISTER(NAME) uint8_t NAME
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 44cb883478..39299295cf 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index fbf9ffa667..e471652ef9 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/src/drivers/i2c/tpm/chip.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/i2c/tpm/chip.h b/src/drivers/i2c/tpm/chip.h
index 491d0223f8..fadd1ec849 100644
--- a/src/drivers/i2c/tpm/chip.h
+++ b/src/drivers/i2c/tpm/chip.h
@@ -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 <device/i2c_simple.h>
struct drivers_i2c_tpm_config {
diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c
index af554f43b4..a090a1fce5 100644
--- a/src/drivers/intel/fsp1_1/raminit.c
+++ b/src/drivers/intel/fsp1_1/raminit.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 <cf9_reset.h>
#include <commonlib/helpers.h>
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index 8d51244914..11eee04e88 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <bootmode.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include <fsp/ramstage.h>
diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c
index 5f7864412b..90760970a5 100644
--- a/src/drivers/intel/fsp1_1/romstage.c
+++ b/src/drivers/intel/fsp1_1/romstage.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 <console/console.h>
#include <cbmem.h>
diff --git a/src/drivers/intel/gma/acpi.c b/src/drivers/intel/gma/acpi.c
index 5a10ab4ed7..b7f4847ce5 100644
--- a/src/drivers/intel/gma/acpi.c
+++ b/src/drivers/intel/gma/acpi.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* 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 <string.h>
#include "i915.h"
diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index 59d3010be1..aac330415b 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/src/drivers/intel/gma/intel_ddi.c
@@ -30,7 +30,7 @@
#include <device/device.h>
#include <device/pci_def.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/pci.h>
#include <ec/google/chromeec/ec.h>
#include <cpu/x86/tsc.h>
diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c
index 56449d0a11..cd42337d07 100644
--- a/src/drivers/intel/gma/opregion.c
+++ b/src/drivers/intel/gma/opregion.c
@@ -12,7 +12,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <types.h>
#include <string.h>
#include <cbfs.h>
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 58402869f4..adfa4f1800 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/pci.h>
#include <device/pci_ids.h>
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index b8e1076346..16e139eb52 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/i2c_simple.h>
#include <device/device.h>
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index 145313a599..c3b2b4ee2e 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/src/drivers/ipmi/ipmi_kcs_ops.c
@@ -13,8 +13,8 @@
#include <device/device.h>
#include <device/pnp.h>
#if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#endif
#if CONFIG(GENERATE_SMBIOS_TABLES)
#include <smbios.h>
diff --git a/src/drivers/lenovo/wacom.c b/src/drivers/lenovo/wacom.c
index 442089814c..1da5ddc989 100644
--- a/src/drivers/lenovo/wacom.c
+++ b/src/drivers/lenovo/wacom.c
@@ -14,8 +14,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/pnp.h>
#include <string.h>
diff --git a/src/drivers/net/chip.h b/src/drivers/net/chip.h
index bc4ae4b6e8..df22db2107 100644
--- a/src/drivers/net/chip.h
+++ b/src/drivers/net/chip.h
@@ -5,7 +5,7 @@
#define __DRIVERS_R8168_CHIP_H__
#include <stdint.h>
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
struct drivers_net_config {
uint16_t customized_leds;
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index b904586dd5..92cb9b54f2 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -9,8 +9,8 @@
*/
#include <cbfs.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <string.h>
#include <arch/io.h>
#include <console/console.h>
diff --git a/src/drivers/pc80/pc/keyboard.c b/src/drivers/pc80/pc/keyboard.c
index d841f946fb..64deacaea1 100644
--- a/src/drivers/pc80/pc/keyboard.c
+++ b/src/drivers/pc80/pc/keyboard.c
@@ -7,7 +7,7 @@
#include <arch/io.h>
#include <delay.h>
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#define KBD_DATA 0x60
#define KBD_COMMAND 0x64
diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c
index 419ed6b9fc..d34fbb13cf 100644
--- a/src/drivers/pc80/rtc/mc146818rtc.c
+++ b/src/drivers/pc80/rtc/mc146818rtc.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 <bcd.h>
#include <fallback.h>
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 3d4c6b6d98..5994cefd86 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -15,9 +15,9 @@
#include <string.h>
#include <delay.h>
#include <device/mmio.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
-#include <arch/acpi_device.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpi_device.h>
#include <device/device.h>
#include <console/console.h>
#include <security/tpm/tis.h>
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 0eeaffbddd..39e887bfd9 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/src/drivers/spi/acpi/acpi.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/drivers/spi/acpi/chip.h b/src/drivers/spi/acpi/chip.h
index b74c1776a2..ea369b308f 100644
--- a/src/drivers/spi/acpi/chip.h
+++ b/src/drivers/spi/acpi/chip.h
@@ -4,7 +4,7 @@
#ifndef __SPI_ACPI_CHIP_H__
#define __SPI_ACPI_CHIP_H__
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
struct drivers_spi_acpi_config {
const char *hid; /* ACPI _HID (required) */
diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c
index 53a0c4b59b..a38e18185a 100644
--- a/src/drivers/tpm/tpm.c
+++ b/src/drivers/tpm/tpm.c
@@ -7,7 +7,7 @@
#include <security/tpm/tspi.h>
#if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
static void init_tpm_dev(void *unused)
diff --git a/src/drivers/usb/acpi/chip.h b/src/drivers/usb/acpi/chip.h
index 42a94d5105..3bca91cf75 100644
--- a/src/drivers/usb/acpi/chip.h
+++ b/src/drivers/usb/acpi/chip.h
@@ -4,9 +4,9 @@
#ifndef __USB_ACPI_CHIP_H__
#define __USB_ACPI_CHIP_H__
-#include <arch/acpi_device.h>
-#include <arch/acpi.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_pld.h>
struct drivers_usb_acpi_config {
const char *desc;
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index 916d3733ec..6720e2c394 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/src/drivers/usb/acpi/usb_acpi.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpi_pld.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi_pld.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/drivers/wifi/generic.c b/src/drivers/wifi/generic.c
index b864094499..ca16686ce6 100644
--- a/src/drivers/wifi/generic.c
+++ b/src/drivers/wifi/generic.c
@@ -12,8 +12,8 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci_def.h>
diff --git a/src/ec/google/chromeec/ec_acpi.c b/src/ec/google/chromeec/ec_acpi.c
index 2331c7a492..b29c32f3e1 100644
--- a/src/ec/google/chromeec/ec_acpi.c
+++ b/src/ec/google/chromeec/ec_acpi.c
@@ -5,10 +5,10 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
-#include <arch/acpigen_ps2_keybd.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_ps2_keybd.h>
#include <console/console.h>
#include <drivers/usb/acpi/chip.h>
#include <stdlib.h>
diff --git a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
index 51375f8f22..7a110cba26 100644
--- a/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
+++ b/src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
diff --git a/src/ec/google/chromeec/smihandler.c b/src/ec/google/chromeec/smihandler.c
index 5e192a51da..fb8bb7e04c 100644
--- a/src/ec/google/chromeec/smihandler.c
+++ b/src/ec/google/chromeec/smihandler.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 <cpu/x86/smm.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/ec/google/wilco/chip.c b/src/ec/google/wilco/chip.c
index 0d0f987da3..7516b2a879 100644
--- a/src/ec/google/wilco/chip.c
+++ b/src/ec/google/wilco/chip.c
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
#include <arch/cpu.h>
#include <bootstate.h>
#include <cbmem.h>
diff --git a/src/ec/google/wilco/smihandler.c b/src/ec/google/wilco/smihandler.c
index a9f07fe0c4..f3ed90b5a4 100644
--- a/src/ec/google/wilco/smihandler.c
+++ b/src/ec/google/wilco/smihandler.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 <cpu/x86/smm.h>
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index e69b242bcb..69a43a9826 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.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/pnp.h>
diff --git a/src/ec/lenovo/h8/ssdt.c b/src/ec/lenovo/h8/ssdt.c
index 56e305a787..92522cd8fe 100644
--- a/src/ec/lenovo/h8/ssdt.c
+++ b/src/ec/lenovo/h8/ssdt.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <console/console.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <string.h>
#include "h8.h"
diff --git a/src/include/acpi/acpi_pld.h b/src/include/acpi/acpi_pld.h
index 944eb3154a..c518077597 100644
--- a/src/include/acpi/acpi_pld.h
+++ b/src/include/acpi/acpi_pld.h
@@ -4,7 +4,7 @@
#ifndef __ACPI_PLD_H
#define __ACPI_PLD_H
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <stdint.h>
enum acpi_pld_panel {
diff --git a/src/include/acpi/acpigen.h b/src/include/acpi/acpigen.h
index a3c4777afb..005ec6b096 100644
--- a/src/include/acpi/acpigen.h
+++ b/src/include/acpi/acpigen.h
@@ -5,9 +5,9 @@
#define LIBACPI_H
#include <stdint.h>
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi_pld.h>
#include <device/pci_type.h>
/* Values that can be returned for ACPI Device _STA method */
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 3c8e76e7ef..a787efe889 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -5,7 +5,7 @@
#define DEVICE_AZALIA_H
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/mmio.h>
#include <device/device.h>
diff --git a/src/include/device/pci_rom.h b/src/include/device/pci_rom.h
index 6b6fee2c44..c49389f396 100644
--- a/src/include/device/pci_rom.h
+++ b/src/include/device/pci_rom.h
@@ -2,7 +2,7 @@
#define PCI_ROM_H
#include <endian.h>
#include <stddef.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#define PCI_ROM_HDR 0xAA55
#define PCI_DATA_HDR ((uint32_t) (('R' << 24) | ('I' << 16) | ('C' << 8) | 'P'))
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index d2615243b2..075bd04082 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -26,7 +26,7 @@
#endif
#if CONFIG(CHROMEOS)
#if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
#include <vendorcode/google/chromeos/chromeos.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 4fdf55446a..73632fc512 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -21,7 +21,7 @@
#include <boot/tables.h>
#include <program_loading.h>
#if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
#include <timer.h>
#include <timestamp.h>
diff --git a/src/lib/nhlt.c b/src/lib/nhlt.c
index 4ed3c6c13c..462a9ce57d 100644
--- a/src/lib/nhlt.c
+++ b/src/lib/nhlt.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 <commonlib/endian.h>
#include <console/console.h>
diff --git a/src/mainboard/51nb/x210/dsdt.asl b/src/mainboard/51nb/x210/dsdt.asl
index b88a56c632..277a96b076 100644
--- a/src/mainboard/51nb/x210/dsdt.asl
+++ b/src/mainboard/51nb/x210/dsdt.asl
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/amd/gardenia/acpi/routing.asl b/src/mainboard/amd/gardenia/acpi/routing.asl
index 642ef8f8ad..dd0a48d5eb 100644
--- a/src/mainboard/amd/gardenia/acpi/routing.asl
+++ b/src/mainboard/amd/gardenia/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/gardenia/acpi/usb_oc.asl b/src/mainboard/amd/gardenia/acpi/usb_oc.asl
index 8a4df6fbb5..49d7744c4f 100644
--- a/src/mainboard/amd/gardenia/acpi/usb_oc.asl
+++ b/src/mainboard/amd/gardenia/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/gardenia/dsdt.asl b/src/mainboard/amd/gardenia/dsdt.asl
index 4f861cbd04..e2a3dcd11e 100644
--- a/src/mainboard/amd/gardenia/dsdt.asl
+++ b/src/mainboard/amd/gardenia/dsdt.asl
@@ -4,7 +4,7 @@
#define MAINBOARD_HAS_SPEAKER 1
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/inagua/acpi/routing.asl b/src/mainboard/amd/inagua/acpi/routing.asl
index 88024a73f2..c7d9861738 100644
--- a/src/mainboard/amd/inagua/acpi/routing.asl
+++ b/src/mainboard/amd/inagua/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/inagua/acpi/usb_oc.asl b/src/mainboard/amd/inagua/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/amd/inagua/acpi/usb_oc.asl
+++ b/src/mainboard/amd/inagua/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl
index ca149ba600..09ea5b0b34 100644
--- a/src/mainboard/amd/inagua/dsdt.asl
+++ b/src/mainboard/amd/inagua/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/olivehill/acpi/routing.asl b/src/mainboard/amd/olivehill/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/amd/olivehill/acpi/routing.asl
+++ b/src/mainboard/amd/olivehill/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/olivehill/acpi/usb_oc.asl b/src/mainboard/amd/olivehill/acpi/usb_oc.asl
index 4ea18f54b8..e95ec3f6c3 100644
--- a/src/mainboard/amd/olivehill/acpi/usb_oc.asl
+++ b/src/mainboard/amd/olivehill/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/olivehill/dsdt.asl b/src/mainboard/amd/olivehill/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/amd/olivehill/dsdt.asl
+++ b/src/mainboard/amd/olivehill/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/padmelon/dsdt.asl b/src/mainboard/amd/padmelon/dsdt.asl
index aa8c2c3009..30d43c3eaa 100644
--- a/src/mainboard/amd/padmelon/dsdt.asl
+++ b/src/mainboard/amd/padmelon/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/padmelon/mainboard.c b/src/mainboard/amd/padmelon/mainboard.c
index 7edd3bef45..7be4ebab5c 100644
--- a/src/mainboard/amd/padmelon/mainboard.c
+++ b/src/mainboard/amd/padmelon/mainboard.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/amd_pci_util.h>
#include <soc/pci_devs.h>
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/parmer/dsdt.asl b/src/mainboard/amd/parmer/dsdt.asl
index 20e550f157..85ec272659 100644
--- a/src/mainboard/amd/parmer/dsdt.asl
+++ b/src/mainboard/amd/parmer/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/persimmon/acpi/routing.asl b/src/mainboard/amd/persimmon/acpi/routing.asl
index d7dc69a34d..eea2b4d55d 100644
--- a/src/mainboard/amd/persimmon/acpi/routing.asl
+++ b/src/mainboard/amd/persimmon/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/persimmon/acpi/usb_oc.asl b/src/mainboard/amd/persimmon/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/amd/persimmon/acpi/usb_oc.asl
+++ b/src/mainboard/amd/persimmon/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl
index ca149ba600..09ea5b0b34 100644
--- a/src/mainboard/amd/persimmon/dsdt.asl
+++ b/src/mainboard/amd/persimmon/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/south_station/acpi/routing.asl b/src/mainboard/amd/south_station/acpi/routing.asl
index 88024a73f2..c7d9861738 100644
--- a/src/mainboard/amd/south_station/acpi/routing.asl
+++ b/src/mainboard/amd/south_station/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/south_station/acpi/usb_oc.asl b/src/mainboard/amd/south_station/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/amd/south_station/acpi/usb_oc.asl
+++ b/src/mainboard/amd/south_station/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl
index ca149ba600..09ea5b0b34 100644
--- a/src/mainboard/amd/south_station/dsdt.asl
+++ b/src/mainboard/amd/south_station/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/thatcher/acpi/cpstate.asl b/src/mainboard/amd/thatcher/acpi/cpstate.asl
index 86361521a2..9e7fdcf706 100644
--- a/src/mainboard/amd/thatcher/acpi/cpstate.asl
+++ b/src/mainboard/amd/thatcher/acpi/cpstate.asl
@@ -7,7 +7,7 @@
* characteristics.
*/
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{
Scope (\_SB) {
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/thatcher/dsdt.asl b/src/mainboard/amd/thatcher/dsdt.asl
index 20e550f157..85ec272659 100644
--- a/src/mainboard/amd/thatcher/dsdt.asl
+++ b/src/mainboard/amd/thatcher/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/amd/union_station/acpi/routing.asl b/src/mainboard/amd/union_station/acpi/routing.asl
index 88024a73f2..c7d9861738 100644
--- a/src/mainboard/amd/union_station/acpi/routing.asl
+++ b/src/mainboard/amd/union_station/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/union_station/acpi/usb_oc.asl b/src/mainboard/amd/union_station/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/amd/union_station/acpi/usb_oc.asl
+++ b/src/mainboard/amd/union_station/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl
index ca149ba600..09ea5b0b34 100644
--- a/src/mainboard/amd/union_station/dsdt.asl
+++ b/src/mainboard/amd/union_station/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index e76e525a4d..778455a1ff 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -6,7 +6,7 @@
* Ported to AOpen DXPL Plus-U by Kyösti Mälkki
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/pci_def.h>
#define IOAPIC_ICH4 2
diff --git a/src/mainboard/aopen/dxplplusu/dsdt.asl b/src/mainboard/aopen/dxplplusu/dsdt.asl
index 7fcdad960a..d43e7b63f3 100644
--- a/src/mainboard/aopen/dxplplusu/dsdt.asl
+++ b/src/mainboard/aopen/dxplplusu/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/aopen/dxplplusu/fadt.c b/src/mainboard/aopen/dxplplusu/fadt.c
index 4f3c2be4fc..6460dbd79b 100644
--- a/src/mainboard/aopen/dxplplusu/fadt.c
+++ b/src/mainboard/aopen/dxplplusu/fadt.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <version.h>
/* FIXME: This needs to go into a separate .h file
diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl
index f14272d5a7..77d6daf19f 100644
--- a/src/mainboard/apple/macbook21/dsdt.asl
+++ b/src/mainboard/apple/macbook21/dsdt.asl
@@ -5,7 +5,7 @@
#define BRIGHTNESS_DOWN \DSPC.BRTD
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index cb722562c8..a537fd31cc 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -3,7 +3,7 @@
#include <device/device.h>
#include <northbridge/intel/i945/i945.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <drivers/intel/gma/int15.h>
#include <ec/acpi/ec.h>
diff --git a/src/mainboard/apple/macbookair4_2/dsdt.asl b/src/mainboard/apple/macbookair4_2/dsdt.asl
index 01656ad269..315fd4df1d 100644
--- a/src/mainboard/apple/macbookair4_2/dsdt.asl
+++ b/src/mainboard/apple/macbookair4_2/dsdt.asl
@@ -4,7 +4,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asrock/b75pro3-m/dsdt.asl b/src/mainboard/asrock/b75pro3-m/dsdt.asl
index ff5c708e1d..6d9866e1b6 100644
--- a/src/mainboard/asrock/b75pro3-m/dsdt.asl
+++ b/src/mainboard/asrock/b75pro3-m/dsdt.asl
@@ -4,7 +4,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asrock/b85m_pro4/dsdt.asl b/src/mainboard/asrock/b85m_pro4/dsdt.asl
index 8764b2d671..f9664fc4f4 100644
--- a/src/mainboard/asrock/b85m_pro4/dsdt.asl
+++ b/src/mainboard/asrock/b85m_pro4/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/asrock/e350m1/acpi/routing.asl b/src/mainboard/asrock/e350m1/acpi/routing.asl
index 2ddb2885a9..d77d22df0c 100644
--- a/src/mainboard/asrock/e350m1/acpi/routing.asl
+++ b/src/mainboard/asrock/e350m1/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
+++ b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl
index e05fee5e28..60a5d84340 100644
--- a/src/mainboard/asrock/e350m1/dsdt.asl
+++ b/src/mainboard/asrock/e350m1/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/asrock/g41c-gs/cstates.c b/src/mainboard/asrock/g41c-gs/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/asrock/g41c-gs/cstates.c
+++ b/src/mainboard/asrock/g41c-gs/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/asrock/g41c-gs/dsdt.asl b/src/mainboard/asrock/g41c-gs/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/asrock/g41c-gs/dsdt.asl
+++ b/src/mainboard/asrock/g41c-gs/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asrock/h110m/dsdt.asl b/src/mainboard/asrock/h110m/dsdt.asl
index 568ca39132..14350c9cce 100644
--- a/src/mainboard/asrock/h110m/dsdt.asl
+++ b/src/mainboard/asrock/h110m/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asrock/h81m-hds/dsdt.asl b/src/mainboard/asrock/h81m-hds/dsdt.asl
index 1b1ec6eaef..3e7d798855 100644
--- a/src/mainboard/asrock/h81m-hds/dsdt.asl
+++ b/src/mainboard/asrock/h81m-hds/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asrock/imb-a180/acpi/routing.asl b/src/mainboard/asrock/imb-a180/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/asrock/imb-a180/acpi/routing.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
index e44e97001e..d80cc35552 100644
--- a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asrock/imb-a180/dsdt.asl b/src/mainboard/asrock/imb-a180/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/asrock/imb-a180/dsdt.asl
+++ b/src/mainboard/asrock/imb-a180/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/asus/am1i-a/acpi_tables.c b/src/mainboard/asus/am1i-a/acpi_tables.c
index e6397d3632..047a3a015e 100644
--- a/src/mainboard/asus/am1i-a/acpi_tables.c
+++ b/src/mainboard/asus/am1i-a/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asus/am1i-a/dsdt.asl b/src/mainboard/asus/am1i-a/dsdt.asl
index f6d028f7c7..c9e6be0dff 100644
--- a/src/mainboard/asus/am1i-a/dsdt.asl
+++ b/src/mainboard/asus/am1i-a/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
index 86361521a2..9e7fdcf706 100644
--- a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
@@ -7,7 +7,7 @@
* characteristics.
*/
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{
Scope (\_SB) {
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/asus/f2a85-m/dsdt.asl b/src/mainboard/asus/f2a85-m/dsdt.asl
index e43640918c..bcde29de93 100644
--- a/src/mainboard/asus/f2a85-m/dsdt.asl
+++ b/src/mainboard/asus/f2a85-m/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/asus/h61m-cs/dsdt.asl b/src/mainboard/asus/h61m-cs/dsdt.asl
index 42fc8abb15..28cf2fed82 100644
--- a/src/mainboard/asus/h61m-cs/dsdt.asl
+++ b/src/mainboard/asus/h61m-cs/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
index a9b0faa5b4..8708809fee 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
+++ b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p2b/acpi_tables.c b/src/mainboard/asus/p2b/acpi_tables.c
index 9f18039c32..39a9719202 100644
--- a/src/mainboard/asus/p2b/acpi_tables.c
+++ b/src/mainboard/asus/p2b/acpi_tables.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>
unsigned long acpi_fill_madt(unsigned long current)
{
diff --git a/src/mainboard/asus/p2b/dsdt.asl b/src/mainboard/asus/p2b/dsdt.asl
index e119871ed6..c3a279d672 100644
--- a/src/mainboard/asus/p2b/dsdt.asl
+++ b/src/mainboard/asus/p2b/dsdt.asl
@@ -9,7 +9,7 @@
#define SUPERIO_SHOW_FDC
#define SUPERIO_SHOW_LPT
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.aml", "DSDT", 2, OEM_ID, ACPI_TABLE_CREATOR, 1)
{
/* \_SB scope defining the main processor is generated in SSDT. */
diff --git a/src/mainboard/asus/p5gc-mx/cstates.c b/src/mainboard/asus/p5gc-mx/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/asus/p5gc-mx/cstates.c
+++ b/src/mainboard/asus/p5gc-mx/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/asus/p5gc-mx/dsdt.asl b/src/mainboard/asus/p5gc-mx/dsdt.asl
index a27be09a6b..c3f5e4b8ef 100644
--- a/src/mainboard/asus/p5gc-mx/dsdt.asl
+++ b/src/mainboard/asus/p5gc-mx/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p5qc/cstates.c b/src/mainboard/asus/p5qc/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/asus/p5qc/cstates.c
+++ b/src/mainboard/asus/p5qc/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/asus/p5qc/dsdt.asl b/src/mainboard/asus/p5qc/dsdt.asl
index b72be15736..1b6651eb33 100644
--- a/src/mainboard/asus/p5qc/dsdt.asl
+++ b/src/mainboard/asus/p5qc/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c
index a775b6df25..e34767bf8e 100644
--- a/src/mainboard/asus/p5ql-em/acpi_tables.c
+++ b/src/mainboard/asus/p5ql-em/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <string.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <southbridge/intel/i82801jx/nvs.h>
void acpi_create_gnvs(global_nvs_t *gnvs)
diff --git a/src/mainboard/asus/p5ql-em/dsdt.asl b/src/mainboard/asus/p5ql-em/dsdt.asl
index 2228a1c75e..e8ded2937f 100644
--- a/src/mainboard/asus/p5ql-em/dsdt.asl
+++ b/src/mainboard/asus/p5ql-em/dsdt.asl
@@ -3,7 +3,7 @@
#include <southbridge/intel/i82801jx/i82801jx.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p5qpl-am/cstates.c b/src/mainboard/asus/p5qpl-am/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/asus/p5qpl-am/cstates.c
+++ b/src/mainboard/asus/p5qpl-am/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/asus/p5qpl-am/dsdt.asl b/src/mainboard/asus/p5qpl-am/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/asus/p5qpl-am/dsdt.asl
+++ b/src/mainboard/asus/p5qpl-am/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p8h61-m_lx/dsdt.asl b/src/mainboard/asus/p8h61-m_lx/dsdt.asl
index a9b0faa5b4..8708809fee 100644
--- a/src/mainboard/asus/p8h61-m_lx/dsdt.asl
+++ b/src/mainboard/asus/p8h61-m_lx/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl b/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl
index af0cbad1d1..21538247fa 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl
+++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/asus/p8h61-m_pro/dsdt.asl b/src/mainboard/asus/p8h61-m_pro/dsdt.asl
index 7da32d3884..b77c2bac03 100644
--- a/src/mainboard/asus/p8h61-m_pro/dsdt.asl
+++ b/src/mainboard/asus/p8h61-m_pro/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p8z77-m_pro/dsdt.asl b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
index 0c024568f4..ce1d905b6c 100644
--- a/src/mainboard/asus/p8z77-m_pro/dsdt.asl
+++ b/src/mainboard/asus/p8z77-m_pro/dsdt.asl
@@ -3,7 +3,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/asus/p8z77-v_lx2/dsdt.asl b/src/mainboard/asus/p8z77-v_lx2/dsdt.asl
index 9481566ce1..10b8ec7f97 100644
--- a/src/mainboard/asus/p8z77-v_lx2/dsdt.asl
+++ b/src/mainboard/asus/p8z77-v_lx2/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/bap/ode_e20XX/acpi/routing.asl b/src/mainboard/bap/ode_e20XX/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/routing.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
index db55264f91..52b5606013 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/bap/ode_e20XX/dsdt.asl b/src/mainboard/bap/ode_e20XX/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/bap/ode_e20XX/dsdt.asl
+++ b/src/mainboard/bap/ode_e20XX/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/bap/ode_e21XX/acpi/routing.asl b/src/mainboard/bap/ode_e21XX/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/bap/ode_e21XX/acpi/routing.asl
+++ b/src/mainboard/bap/ode_e21XX/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl b/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl
index b7757d3950..f6d8c9226b 100644
--- a/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl
+++ b/src/mainboard/bap/ode_e21XX/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/bap/ode_e21XX/acpi_tables.c b/src/mainboard/bap/ode_e21XX/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/bap/ode_e21XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e21XX/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/bap/ode_e21XX/dsdt.asl b/src/mainboard/bap/ode_e21XX/dsdt.asl
index f18550a695..370e6b312f 100644
--- a/src/mainboard/bap/ode_e21XX/dsdt.asl
+++ b/src/mainboard/bap/ode_e21XX/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/biostar/a68n_5200/acpi/routing.asl b/src/mainboard/biostar/a68n_5200/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/biostar/a68n_5200/acpi/routing.asl
+++ b/src/mainboard/biostar/a68n_5200/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl b/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl
index 4ea18f54b8..e95ec3f6c3 100644
--- a/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl
+++ b/src/mainboard/biostar/a68n_5200/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/biostar/a68n_5200/acpi_tables.c b/src/mainboard/biostar/a68n_5200/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/biostar/a68n_5200/acpi_tables.c
+++ b/src/mainboard/biostar/a68n_5200/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/biostar/a68n_5200/dsdt.asl b/src/mainboard/biostar/a68n_5200/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/biostar/a68n_5200/dsdt.asl
+++ b/src/mainboard/biostar/a68n_5200/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/biostar/am1ml/acpi/routing.asl b/src/mainboard/biostar/am1ml/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/biostar/am1ml/acpi/routing.asl
+++ b/src/mainboard/biostar/am1ml/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
index 6ebc4bc4c4..9bb27eaa70 100644
--- a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
+++ b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index e6397d3632..047a3a015e 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/biostar/am1ml/dsdt.asl b/src/mainboard/biostar/am1ml/dsdt.asl
index a2e69b188c..e2ac8926ef 100644
--- a/src/mainboard/biostar/am1ml/dsdt.asl
+++ b/src/mainboard/biostar/am1ml/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/compulab/intense_pc/dsdt.asl b/src/mainboard/compulab/intense_pc/dsdt.asl
index 247114ef86..f6d5d4a0b1 100644
--- a/src/mainboard/compulab/intense_pc/dsdt.asl
+++ b/src/mainboard/compulab/intense_pc/dsdt.asl
@@ -5,7 +5,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/elmex/pcm205400/acpi/routing.asl b/src/mainboard/elmex/pcm205400/acpi/routing.asl
index d7dc69a34d..eea2b4d55d 100644
--- a/src/mainboard/elmex/pcm205400/acpi/routing.asl
+++ b/src/mainboard/elmex/pcm205400/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl b/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl
+++ b/src/mainboard/elmex/pcm205400/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/elmex/pcm205400/acpi_tables.c b/src/mainboard/elmex/pcm205400/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/elmex/pcm205400/acpi_tables.c
+++ b/src/mainboard/elmex/pcm205400/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/elmex/pcm205400/dsdt.asl b/src/mainboard/elmex/pcm205400/dsdt.asl
index ca149ba600..09ea5b0b34 100644
--- a/src/mainboard/elmex/pcm205400/dsdt.asl
+++ b/src/mainboard/elmex/pcm205400/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
index 08df134e59..39143e42bb 100644
--- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
index 9bef7d9c18..ad9243b9cb 100644
--- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl
+++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"dsdt.aml", // Output Filename
"DSDT", // Signature
diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
index 8afd832aeb..ccd12312ea 100644
--- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
@@ -7,7 +7,7 @@
#include <smbios.h>
#include <console/console.h>
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <commonlib/endian.h>
#include "fw_cfg.h"
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 359c562e53..2be4ed07cb 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -3,7 +3,7 @@
#include <types.h>
#include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl
index ea17df21e2..5e4769da56 100644
--- a/src/mainboard/emulation/qemu-q35/dsdt.asl
+++ b/src/mainboard/emulation/qemu-q35/dsdt.asl
@@ -19,7 +19,7 @@
* Based on acpi-dsdt.dsl, but heavily modified for q35 chipset.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"dsdt.aml", // Output Filename
"DSDT", // Signature
diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c
index ae5aaf1f0f..45fb909057 100644
--- a/src/mainboard/facebook/fbg1701/acpi_tables.c
+++ b/src/mainboard/facebook/fbg1701/acpi_tables.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/ioapic.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/facebook/fbg1701/dsdt.asl b/src/mainboard/facebook/fbg1701/dsdt.asl
index b0a2af8d93..98e261550d 100644
--- a/src/mainboard/facebook/fbg1701/dsdt.asl
+++ b/src/mainboard/facebook/fbg1701/dsdt.asl
@@ -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>
#define SDCARD_CD 81 /* Not used */
diff --git a/src/mainboard/facebook/monolith/dsdt.asl b/src/mainboard/facebook/monolith/dsdt.asl
index 2cb27ebe8f..b9d961d25e 100644
--- a/src/mainboard/facebook/monolith/dsdt.asl
+++ b/src/mainboard/facebook/monolith/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/foxconn/d41s/cstates.c b/src/mainboard/foxconn/d41s/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/foxconn/d41s/cstates.c
+++ b/src/mainboard/foxconn/d41s/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/foxconn/d41s/dsdt.asl b/src/mainboard/foxconn/d41s/dsdt.asl
index 75b17df090..8746132dbe 100644
--- a/src/mainboard/foxconn/d41s/dsdt.asl
+++ b/src/mainboard/foxconn/d41s/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/foxconn/g41s-k/cstates.c b/src/mainboard/foxconn/g41s-k/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/foxconn/g41s-k/cstates.c
+++ b/src/mainboard/foxconn/g41s-k/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/foxconn/g41s-k/dsdt.asl b/src/mainboard/foxconn/g41s-k/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/foxconn/g41s-k/dsdt.asl
+++ b/src/mainboard/foxconn/g41s-k/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 72c18060f0..3d211de16c 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <string.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <southbridge/intel/i82801gx/nvs.h>
diff --git a/src/mainboard/getac/p470/cstates.c b/src/mainboard/getac/p470/cstates.c
index 69949f519b..b343e97f21 100644
--- a/src/mainboard/getac/p470/cstates.c
+++ b/src/mainboard/getac/p470/cstates.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 <southbridge/intel/i82801gx/i82801gx.h>
static acpi_cstate_t cst_entries[] = {
diff --git a/src/mainboard/getac/p470/dsdt.asl b/src/mainboard/getac/p470/dsdt.asl
index dacdbdf936..6809c42ece 100644
--- a/src/mainboard/getac/p470/dsdt.asl
+++ b/src/mainboard/getac/p470/dsdt.asl
@@ -4,7 +4,7 @@
#define ENABLE_TPM
#undef ENABLE_FDC // There is no Floppy for this laptop
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c b/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.c
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl b/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl
index 9e3c03748c..62aa924f7f 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
index ac65961b6d..a34bb6baba 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c b/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c
index fd5a7f0c44..0506c29496 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/cstates.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/cstates.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>
static acpi_cstate_t cst_entries[] = {};
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/gigabyte/ga-h61m-series/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-series/dsdt.asl
index cea8efe111..1b7bf223bb 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-h61m-series/dsdt.asl
@@ -3,7 +3,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
index 2ddb2885a9..d77d22df0c 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/gizmosphere/gizmo/dsdt.asl b/src/mainboard/gizmosphere/gizmo/dsdt.asl
index a7b28c6985..8227f47e44 100644
--- a/src/mainboard/gizmosphere/gizmo/dsdt.asl
+++ b/src/mainboard/gizmosphere/gizmo/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
index db55264f91..52b5606013 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/gizmosphere/gizmo2/dsdt.asl b/src/mainboard/gizmosphere/gizmo2/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/gizmosphere/gizmo2/dsdt.asl
+++ b/src/mainboard/gizmosphere/gizmo2/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c
index 1cfdb11742..19b75fd11e 100644
--- a/src/mainboard/google/auron/acpi_tables.c
+++ b/src/mainboard/google/auron/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
#include <variant/thermal.h>
diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl
index 6a9e693a06..5df7e077e3 100644
--- a/src/mainboard/google/auron/dsdt.asl
+++ b/src/mainboard/google/auron/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/auron/ec.c b/src/mainboard/google/auron/ec.c
index b3a2d61a7b..a84d9643b3 100644
--- a/src/mainboard/google/auron/ec.c
+++ b/src/mainboard/google/auron/ec.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 <vendorcode/google/chromeos/chromeos.h>
#include <types.h>
#include <console/console.h>
diff --git a/src/mainboard/google/auron/smihandler.c b/src/mainboard/google/auron/smihandler.c
index ab32930bee..153a07169b 100644
--- a/src/mainboard/google/auron/smihandler.c
+++ b/src/mainboard/google/auron/smihandler.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 <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 0445d0dcf5..abc5844ecb 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl
index 014483c170..99dcb7e1f9 100644
--- a/src/mainboard/google/beltino/dsdt.asl
+++ b/src/mainboard/google/beltino/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index a31c5decba..bf52510b3d 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <device/device.h>
#include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/mainboard/google/beltino/smihandler.c b/src/mainboard/google/beltino/smihandler.c
index 2f4b86f085..c7f6c50927 100644
--- a/src/mainboard/google/beltino/smihandler.c
+++ b/src/mainboard/google/beltino/smihandler.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/intel/haswell/haswell.h>
#include <cpu/x86/smm.h>
#include <northbridge/intel/haswell/haswell.h>
diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl
index f75d858f2f..4758afb09e 100644
--- a/src/mainboard/google/butterfly/dsdt.asl
+++ b/src/mainboard/google/butterfly/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/butterfly/early_init.c b/src/mainboard/google/butterfly/early_init.c
index f0658fea2f..102460d2e9 100644
--- a/src/mainboard/google/butterfly/early_init.c
+++ b/src/mainboard/google/butterfly/early_init.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 4c47a6b29a..a5e08bc932 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -8,7 +8,7 @@
#include <console/console.h>
#include <drivers/intel/gma/int15.h>
#include <fmap.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include "onboard.h"
#include "ec.h"
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index 20d218df2e..ef644b1996 100644
--- a/src/mainboard/google/cyan/acpi_tables.c
+++ b/src/mainboard/google/cyan/acpi_tables.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/ioapic.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl
index 84544fcc55..0b444a3edd 100644
--- a/src/mainboard/google/cyan/dsdt.asl
+++ b/src/mainboard/google/cyan/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/cyan/ec.c b/src/mainboard/google/cyan/ec.c
index 55c3e1ff3c..e009bf0927 100644
--- a/src/mainboard/google/cyan/ec.c
+++ b/src/mainboard/google/cyan/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index 8b1032de63..1acac464a3 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.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/mmio.h>
#include <console/console.h>
diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl
index f7bb6b9090..47110f6987 100644
--- a/src/mainboard/google/dedede/dsdt.asl
+++ b/src/mainboard/google/dedede/dsdt.asl
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <variant/ec.h>
#include <variant/gpio.h>
diff --git a/src/mainboard/google/dedede/ec.c b/src/mainboard/google/dedede/ec.c
index 98509c3b53..991dcf9160 100644
--- a/src/mainboard/google/dedede/ec.c
+++ b/src/mainboard/google/dedede/ec.c
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <ec/ec.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c
index ba7ba655f0..a58c5ac3b2 100644
--- a/src/mainboard/google/dedede/mainboard.c
+++ b/src/mainboard/google/dedede/mainboard.c
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <device/device.h>
#include <ec/ec.h>
diff --git a/src/mainboard/google/deltaur/chromeos.c b/src/mainboard/google/deltaur/chromeos.c
index 2665f463df..0e199ca318 100644
--- a/src/mainboard/google/deltaur/chromeos.c
+++ b/src/mainboard/google/deltaur/chromeos.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <baseboard/gpio.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/deltaur/dsdt.asl b/src/mainboard/google/deltaur/dsdt.asl
index b6bc8e4248..631ec5e9dd 100644
--- a/src/mainboard/google/deltaur/dsdt.asl
+++ b/src/mainboard/google/deltaur/dsdt.asl
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include "variant/ec.h"
#include "variant/gpio.h"
diff --git a/src/mainboard/google/deltaur/mainboard.c b/src/mainboard/google/deltaur/mainboard.c
index 0a906d62ad..ba545409f6 100644
--- a/src/mainboard/google/deltaur/mainboard.c
+++ b/src/mainboard/google/deltaur/mainboard.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <device/device.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/deltaur/variants/baseboard/gpio.c b/src/mainboard/google/deltaur/variants/baseboard/gpio.c
index 62b6559e46..c56fff818b 100644
--- a/src/mainboard/google/deltaur/variants/baseboard/gpio.c
+++ b/src/mainboard/google/deltaur/variants/baseboard/gpio.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <baseboard/gpio.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/dragonegg/chromeos.c b/src/mainboard/google/dragonegg/chromeos.c
index efa0b0d0d7..1a16444e0f 100644
--- a/src/mainboard/google/dragonegg/chromeos.c
+++ b/src/mainboard/google/dragonegg/chromeos.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 <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
diff --git a/src/mainboard/google/dragonegg/dsdt.asl b/src/mainboard/google/dragonegg/dsdt.asl
index 7765ac922f..b00babb398 100644
--- a/src/mainboard/google/dragonegg/dsdt.asl
+++ b/src/mainboard/google/dragonegg/dsdt.asl
@@ -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 "variant/ec.h"
#include "variant/gpio.h"
diff --git a/src/mainboard/google/dragonegg/ec.c b/src/mainboard/google/dragonegg/ec.c
index 1b6a5b8896..5ab8c580be 100644
--- a/src/mainboard/google/dragonegg/ec.c
+++ b/src/mainboard/google/dragonegg/ec.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 <ec/google/chromeec/ec.h>
#include <variant/ec.h>
diff --git a/src/mainboard/google/dragonegg/mainboard.c b/src/mainboard/google/dragonegg/mainboard.c
index 0bcb7d674a..a1a545a68c 100644
--- a/src/mainboard/google/dragonegg/mainboard.c
+++ b/src/mainboard/google/dragonegg/mainboard.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 <baseboard/variants.h>
#include <device/device.h>
#include <ec/ec.h>
diff --git a/src/mainboard/google/drallion/chromeos.c b/src/mainboard/google/drallion/chromeos.c
index eff43d0042..279b2f5641 100644
--- a/src/mainboard/google/drallion/chromeos.c
+++ b/src/mainboard/google/drallion/chromeos.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 <boot/coreboot_tables.h>
#include <gpio.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl
index 10a4af5e30..04cf009222 100644
--- a/src/mainboard/google/drallion/dsdt.asl
+++ b/src/mainboard/google/drallion/dsdt.asl
@@ -3,7 +3,7 @@
#include <variant/ec.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/drallion/ramstage.c b/src/mainboard/google/drallion/ramstage.c
index c79a4676dc..9c0c454669 100644
--- a/src/mainboard/google/drallion/ramstage.c
+++ b/src/mainboard/google/drallion/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 <boardid.h>
#include <drivers/vpd/vpd.h>
#include <smbios.h>
diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl
index 90e8502374..db00f7fb2b 100644
--- a/src/mainboard/google/eve/dsdt.asl
+++ b/src/mainboard/google/eve/dsdt.asl
@@ -4,7 +4,7 @@
#include "ec.h"
#include "gpio.h"
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/eve/ec.c b/src/mainboard/google/eve/ec.c
index ec0334883a..006c7ee470 100644
--- a/src/mainboard/google/eve/ec.c
+++ b/src/mainboard/google/eve/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c
index ab7a5a8b28..564e76c90e 100644
--- a/src/mainboard/google/eve/mainboard.c
+++ b/src/mainboard/google/eve/mainboard.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 <ec/ec.h>
diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl
index 542c8445dc..4741513f35 100644
--- a/src/mainboard/google/fizz/dsdt.asl
+++ b/src/mainboard/google/fizz/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/fizz/ec.c b/src/mainboard/google/fizz/ec.c
index 9a1c2797d3..0ae46adc1a 100644
--- a/src/mainboard/google/fizz/ec.c
+++ b/src/mainboard/google/fizz/ec.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 <ec/google/chromeec/ec.h>
#include <variant/ec.h>
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index 4377af3f6c..aaae6f9d3e 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.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 <baseboard/variants.h>
#include <chip.h>
#include <console/console.h>
diff --git a/src/mainboard/google/fizz/variants/karma/smihandler.c b/src/mainboard/google/fizz/variants/karma/smihandler.c
index 369795cb07..a0412b7842 100644
--- a/src/mainboard/google/fizz/variants/karma/smihandler.c
+++ b/src/mainboard/google/fizz/variants/karma/smihandler.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 <baseboard/variants.h>
#include <gpio.h>
diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl
index 708950e044..7d29008127 100644
--- a/src/mainboard/google/glados/dsdt.asl
+++ b/src/mainboard/google/glados/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/glados/ec.c b/src/mainboard/google/glados/ec.c
index fdc57c5e55..029b4fa7b6 100644
--- a/src/mainboard/google/glados/ec.c
+++ b/src/mainboard/google/glados/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c
index 0d6ba32d0c..1db450a7ef 100644
--- a/src/mainboard/google/glados/mainboard.c
+++ b/src/mainboard/google/glados/mainboard.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 <baseboard/variant.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index 1ff4e3c6d2..552f9d8a47 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.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 <baseboard/variant.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/hatch/chromeos.c b/src/mainboard/google/hatch/chromeos.c
index 4825b05885..8e423eb515 100644
--- a/src/mainboard/google/hatch/chromeos.c
+++ b/src/mainboard/google/hatch/chromeos.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 <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
index 04ce112480..e8b9b89399 100644
--- a/src/mainboard/google/hatch/dsdt.asl
+++ b/src/mainboard/google/hatch/dsdt.asl
@@ -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 <variant/ec.h>
#include <variant/gpio.h>
diff --git a/src/mainboard/google/hatch/ec.c b/src/mainboard/google/hatch/ec.c
index f32f4fdf66..fcf4d533fa 100644
--- a/src/mainboard/google/hatch/ec.c
+++ b/src/mainboard/google/hatch/ec.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 <ec/ec.h>
#include <ec/google/chromeec/ec.h>
#include <variant/ec.h>
diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c
index 08e145cd16..66140d169e 100644
--- a/src/mainboard/google/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/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 <baseboard/variants.h>
#include <ec/ec.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c
index 346801433a..efd3d47c2e 100644
--- a/src/mainboard/google/hatch/variants/akemi/gpio.c
+++ b/src/mainboard/google/hatch/variants/akemi/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index 484057bef6..305f3500af 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/dratini/gpio.c b/src/mainboard/google/hatch/variants/dratini/gpio.c
index 6d2da60e9b..ecb13cb078 100644
--- a/src/mainboard/google/hatch/variants/dratini/gpio.c
+++ b/src/mainboard/google/hatch/variants/dratini/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/hatch/gpio.c b/src/mainboard/google/hatch/variants/hatch/gpio.c
index 2faf7921dc..bac4eb7334 100644
--- a/src/mainboard/google/hatch/variants/hatch/gpio.c
+++ b/src/mainboard/google/hatch/variants/hatch/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/helios/gpio.c b/src/mainboard/google/hatch/variants/helios/gpio.c
index 76739c0618..92264bbbce 100644
--- a/src/mainboard/google/hatch/variants/helios/gpio.c
+++ b/src/mainboard/google/hatch/variants/helios/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/jinlon/gpio.c b/src/mainboard/google/hatch/variants/jinlon/gpio.c
index 4cf2bfd9d2..9c1b4b5158 100644
--- a/src/mainboard/google/hatch/variants/jinlon/gpio.c
+++ b/src/mainboard/google/hatch/variants/jinlon/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/kindred/gpio.c b/src/mainboard/google/hatch/variants/kindred/gpio.c
index 588e6ce1be..1b86d85fae 100644
--- a/src/mainboard/google/hatch/variants/kindred/gpio.c
+++ b/src/mainboard/google/hatch/variants/kindred/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/kohaku/gpio.c b/src/mainboard/google/hatch/variants/kohaku/gpio.c
index 8df69cb89c..1df24ee258 100644
--- a/src/mainboard/google/hatch/variants/kohaku/gpio.c
+++ b/src/mainboard/google/hatch/variants/kohaku/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/mushu/gpio.c b/src/mainboard/google/hatch/variants/mushu/gpio.c
index a7898827d7..358d980c1b 100644
--- a/src/mainboard/google/hatch/variants/mushu/gpio.c
+++ b/src/mainboard/google/hatch/variants/mushu/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/nightfury/gpio.c b/src/mainboard/google/hatch/variants/nightfury/gpio.c
index abcb1d83dd..f5154320d9 100644
--- a/src/mainboard/google/hatch/variants/nightfury/gpio.c
+++ b/src/mainboard/google/hatch/variants/nightfury/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/palkia/gpio.c b/src/mainboard/google/hatch/variants/palkia/gpio.c
index 67d070a537..2fed318ddd 100644
--- a/src/mainboard/google/hatch/variants/palkia/gpio.c
+++ b/src/mainboard/google/hatch/variants/palkia/gpio.c
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/hatch/variants/stryke/gpio.c b/src/mainboard/google/hatch/variants/stryke/gpio.c
index 0249a307d1..3ad8fcff40 100644
--- a/src/mainboard/google/hatch/variants/stryke/gpio.c
+++ b/src/mainboard/google/hatch/variants/stryke/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index c689c2f457..5dd0c7c7d2 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl
index b2ea3eb6d3..fd287c5fe3 100644
--- a/src/mainboard/google/jecht/dsdt.asl
+++ b/src/mainboard/google/jecht/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index 2bf7802d81..bef6f3a24c 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.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 <vendorcode/google/chromeos/chromeos.h>
#include "onboard.h"
diff --git a/src/mainboard/google/jecht/smihandler.c b/src/mainboard/google/jecht/smihandler.c
index 0d47bf434e..2d8bfc821b 100644
--- a/src/mainboard/google/jecht/smihandler.c
+++ b/src/mainboard/google/jecht/smihandler.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 <cpu/x86/smm.h>
#include <soc/pm.h>
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 56611c5d75..08288f83d7 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/google/kahlee/ec.c b/src/mainboard/google/kahlee/ec.c
index 32f3d3532a..fcec0dc9aa 100644
--- a/src/mainboard/google/kahlee/ec.c
+++ b/src/mainboard/google/kahlee/ec.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 <ec/google/chromeec/ec.h>
#include <amdblocks/lpc.h>
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index 24297a3861..04791a47c5 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -5,7 +5,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/mmio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/amd_pci_util.h>
#include <cbmem.h>
diff --git a/src/mainboard/google/kahlee/smihandler.c b/src/mainboard/google/kahlee/smihandler.c
index 078c9cda4c..afe80b92ba 100644
--- a/src/mainboard/google/kahlee/smihandler.c
+++ b/src/mainboard/google/kahlee/smihandler.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/smm.h>
#include <ec/google/chromeec/smm.h>
#include <gpio.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
index f989bbb6d8..9a51ff3d44 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
- * #include <arch/acpi.h>
+ * #include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
*{
* #include "routing.asl"
diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl
index f75d858f2f..4758afb09e 100644
--- a/src/mainboard/google/link/dsdt.asl
+++ b/src/mainboard/google/link/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/link/early_init.c b/src/mainboard/google/link/early_init.c
index cf9c18f947..28fe3f4f0e 100644
--- a/src/mainboard/google/link/early_init.c
+++ b/src/mainboard/google/link/early_init.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <device/pci_ops.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/link/ec.c b/src/mainboard/google/link/ec.c
index 48a69ce398..3948022998 100644
--- a/src/mainboard/google/link/ec.c
+++ b/src/mainboard/google/link/ec.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 <types.h>
#include <console/console.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 337807a52a..ab096134f1 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -8,7 +8,7 @@
#if CONFIG(VGA_ROM_RUN)
#include <x86emu/x86emu.h>
#endif
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <arch/interrupt.h>
#include "onboard.h"
diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/mainboard_smi.c
index 70b128b48c..12c1b97e87 100644
--- a/src/mainboard/google/link/mainboard_smi.c
+++ b/src/mainboard/google/link/mainboard_smi.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 <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl
index 11313f9336..ec70c31028 100644
--- a/src/mainboard/google/octopus/dsdt.asl
+++ b/src/mainboard/google/octopus/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/octopus/ec.c b/src/mainboard/google/octopus/ec.c
index 18d6b91c4e..3fe1e2f933 100644
--- a/src/mainboard/google/octopus/ec.c
+++ b/src/mainboard/google/octopus/ec.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 <ec/ec.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index dd4d40de91..55404db500 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.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 <baseboard/variants.h>
#include <boardid.h>
#include <bootstate.h>
diff --git a/src/mainboard/google/octopus/smihandler.c b/src/mainboard/google/octopus/smihandler.c
index 7ab8d2d132..74ff64d0a1 100644
--- a/src/mainboard/google/octopus/smihandler.c
+++ b/src/mainboard/google/octopus/smihandler.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 <baseboard/variants.h>
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c
index 228fdbcbeb..fcd44577a0 100644
--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c
+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index 089337ab4c..aa183cb6a7 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.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 <boardid.h>
#include <sar.h>
#include <baseboard/variants.h>
diff --git a/src/mainboard/google/octopus/variants/dood/variant.c b/src/mainboard/google/octopus/variants/dood/variant.c
index 4501f6c08f..e728fe3a08 100644
--- a/src/mainboard/google/octopus/variants/dood/variant.c
+++ b/src/mainboard/google/octopus/variants/dood/variant.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 <boardid.h>
#include <sar.h>
#include <baseboard/variants.h>
diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c
index 5c92035c42..48263700da 100644
--- a/src/mainboard/google/octopus/variants/garg/variant.c
+++ b/src/mainboard/google/octopus/variants/garg/variant.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 <boardid.h>
#include <ec/google/chromeec/ec.h>
#include <drivers/intel/gma/opregion.h>
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index ed6c133a32..ff9680b26d 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl
index 434a83436b..9bb5467fd8 100644
--- a/src/mainboard/google/parrot/dsdt.asl
+++ b/src/mainboard/google/parrot/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/parrot/early_init.c b/src/mainboard/google/parrot/early_init.c
index e42d7933b0..21e6fc671b 100644
--- a/src/mainboard/google/parrot/early_init.c
+++ b/src/mainboard/google/parrot/early_init.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/google/parrot/ec.c b/src/mainboard/google/parrot/ec.c
index 660d41e3f0..b7f3786bfc 100644
--- a/src/mainboard/google/parrot/ec.c
+++ b/src/mainboard/google/parrot/ec.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 <types.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 6851847dd6..620ca648a6 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include "onboard.h"
#include "ec.h"
diff --git a/src/mainboard/google/poppy/chromeos.c b/src/mainboard/google/poppy/chromeos.c
index a0bd9b20f3..c67108bd47 100644
--- a/src/mainboard/google/poppy/chromeos.c
+++ b/src/mainboard/google/poppy/chromeos.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 <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
index 9684c043f0..43d78354e7 100644
--- a/src/mainboard/google/poppy/dsdt.asl
+++ b/src/mainboard/google/poppy/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/poppy/ec.c b/src/mainboard/google/poppy/ec.c
index 77f063d875..fc2d5b5fbd 100644
--- a/src/mainboard/google/poppy/ec.c
+++ b/src/mainboard/google/poppy/ec.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 <baseboard/variants.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c
index e24d6bcaea..5a1bfedf52 100644
--- a/src/mainboard/google/poppy/mainboard.c
+++ b/src/mainboard/google/poppy/mainboard.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 <baseboard/variants.h>
#include <device/device.h>
#include <ec/ec.h>
diff --git a/src/mainboard/google/poppy/variants/nami/smihandler.c b/src/mainboard/google/poppy/variants/nami/smihandler.c
index 0e4c085d9b..8f04f3baa1 100644
--- a/src/mainboard/google/poppy/variants/nami/smihandler.c
+++ b/src/mainboard/google/poppy/variants/nami/smihandler.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 <baseboard/variants.h>
#include <delay.h>
diff --git a/src/mainboard/google/poppy/variants/nautilus/smihandler.c b/src/mainboard/google/poppy/variants/nautilus/smihandler.c
index a65172374b..44b7c9e782 100644
--- a/src/mainboard/google/poppy/variants/nautilus/smihandler.c
+++ b/src/mainboard/google/poppy/variants/nautilus/smihandler.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 <baseboard/variants.h>
#include <gpio.h>
#include <variant/sku.h>
diff --git a/src/mainboard/google/poppy/variants/nocturne/ec.c b/src/mainboard/google/poppy/variants/nocturne/ec.c
index 7619c7f602..b303984665 100644
--- a/src/mainboard/google/poppy/variants/nocturne/ec.c
+++ b/src/mainboard/google/poppy/variants/nocturne/ec.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 <baseboard/variants.h>
#include <boardid.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index ef65930bf3..2120e23b34 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl
index ce393a312c..1471e2a899 100644
--- a/src/mainboard/google/rambi/dsdt.asl
+++ b/src/mainboard/google/rambi/dsdt.asl
@@ -3,7 +3,7 @@
#define ENABLE_TPM
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/rambi/ec.c b/src/mainboard/google/rambi/ec.c
index 4e1a192ee4..1187078b13 100644
--- a/src/mainboard/google/rambi/ec.c
+++ b/src/mainboard/google/rambi/ec.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 <types.h>
#include <console/console.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index 51da9b8672..ec0ce4a73f 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -7,7 +7,7 @@
#if CONFIG(VGA_ROM_RUN)
#include <x86emu/x86emu.h>
#endif
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/interrupt.h>
#include <smbios.h>
#include "ec.h"
diff --git a/src/mainboard/google/rambi/mainboard_smi.c b/src/mainboard/google/rambi/mainboard_smi.c
index fa0e39f999..5ac4ada2b5 100644
--- a/src/mainboard/google/rambi/mainboard_smi.c
+++ b/src/mainboard/google/rambi/mainboard_smi.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 <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl
index 11313f9336..ec70c31028 100644
--- a/src/mainboard/google/reef/dsdt.asl
+++ b/src/mainboard/google/reef/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/reef/ec.c b/src/mainboard/google/reef/ec.c
index 0a86910063..65334a00fb 100644
--- a/src/mainboard/google/reef/ec.c
+++ b/src/mainboard/google/reef/ec.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 <ec/ec.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c
index 66cf9c1b68..759bd2ece2 100644
--- a/src/mainboard/google/reef/mainboard.c
+++ b/src/mainboard/google/reef/mainboard.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 <baseboard/variants.h>
#include <boardid.h>
#include <console/console.h>
diff --git a/src/mainboard/google/reef/smihandler.c b/src/mainboard/google/reef/smihandler.c
index bde2e43e5a..ca5e277b47 100644
--- a/src/mainboard/google/reef/smihandler.c
+++ b/src/mainboard/google/reef/smihandler.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 <baseboard/variants.h>
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
diff --git a/src/mainboard/google/reef/variants/coral/gpio.c b/src/mainboard/google/reef/variants/coral/gpio.c
index 3b3839ec9f..52d4a9182a 100644
--- a/src/mainboard/google/reef/variants/coral/gpio.c
+++ b/src/mainboard/google/reef/variants/coral/gpio.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <commonlib/helpers.h>
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index cd59fa9dec..471174eddc 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.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 <boot/coreboot_tables.h>
#include <gpio.h>
#include <soc/gpio.h>
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
index 25a10d8343..a019dc5277 100644
--- a/src/mainboard/google/sarien/dsdt.asl
+++ b/src/mainboard/google/sarien/dsdt.asl
@@ -3,7 +3,7 @@
#include <variant/ec.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/sarien/ramstage.c b/src/mainboard/google/sarien/ramstage.c
index 0b2d51b2af..7f129615ec 100644
--- a/src/mainboard/google/sarien/ramstage.c
+++ b/src/mainboard/google/sarien/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 <boardid.h>
#include <drivers/vpd/vpd.h>
#include <smbios.h>
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 9666f296f4..2ecea5108f 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
index 767401d7ce..bb362c33bd 100644
--- a/src/mainboard/google/slippy/dsdt.asl
+++ b/src/mainboard/google/slippy/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/slippy/ec.c b/src/mainboard/google/slippy/ec.c
index 484b4acbba..4b937138b3 100644
--- a/src/mainboard/google/slippy/ec.c
+++ b/src/mainboard/google/slippy/ec.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 <types.h>
#include <console/console.h>
#include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index eea029c7fe..6ba83eeed6 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -5,7 +5,7 @@
#include <smbios.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/slippy/smihandler.c b/src/mainboard/google/slippy/smihandler.c
index d2d81f8de4..b587353132 100644
--- a/src/mainboard/google/slippy/smihandler.c
+++ b/src/mainboard/google/slippy/smihandler.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 <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 94d7803fa0..ac74f1822b 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl
index 49891c3470..12368d6932 100644
--- a/src/mainboard/google/stout/dsdt.asl
+++ b/src/mainboard/google/stout/dsdt.asl
@@ -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/acpi.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/google/stout/early_init.c b/src/mainboard/google/stout/early_init.c
index bbac23871a..c5ba372cb3 100644
--- a/src/mainboard/google/stout/early_init.c
+++ b/src/mainboard/google/stout/early_init.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit.h>
diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index 8a6cf8f6be..2ae581feb3 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.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 <types.h>
#include <console/console.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 6f0444f7ba..86985203c2 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -5,7 +5,7 @@
#include <device/device.h>
#include <device/pci_ops.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <ec/quanta/it8518/ec.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index e2dcaef3f1..a87c743488 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include "variant/ec.h"
#include "variant/gpio.h"
diff --git a/src/mainboard/google/volteer/ec.c b/src/mainboard/google/volteer/ec.c
index d36c1e33af..10ed955ee0 100644
--- a/src/mainboard/google/volteer/ec.c
+++ b/src/mainboard/google/volteer/ec.c
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <ec/ec.h>
#include <ec/google/chromeec/ec.h>
#include <variant/ec.h>
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 0db43d1bed..22a6c77c1d 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -6,7 +6,7 @@
*/
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <baseboard/variants.h>
#include <device/device.h>
#include <ec/ec.h>
diff --git a/src/mainboard/hp/abm/acpi/routing.asl b/src/mainboard/hp/abm/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/hp/abm/acpi/routing.asl
+++ b/src/mainboard/hp/abm/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/hp/abm/acpi/usb_oc.asl b/src/mainboard/hp/abm/acpi/usb_oc.asl
index db55264f91..52b5606013 100644
--- a/src/mainboard/hp/abm/acpi/usb_oc.asl
+++ b/src/mainboard/hp/abm/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/hp/abm/dsdt.asl b/src/mainboard/hp/abm/dsdt.asl
index 1b822e60ba..4fdefdc1a8 100644
--- a/src/mainboard/hp/abm/dsdt.asl
+++ b/src/mainboard/hp/abm/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
index 150bdcf05a..5fc8201391 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
+++ b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl
@@ -4,7 +4,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
index 79f4b3f402..2df49f797d 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
@@ -4,7 +4,7 @@
#include "mainboard.h"
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
index 42af1b8efa..db19d56a96 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
@@ -3,7 +3,7 @@
#include "ec.h"
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/hp/snb_ivb_laptops/dsdt.asl b/src/mainboard/hp/snb_ivb_laptops/dsdt.asl
index 150bdcf05a..5fc8201391 100644
--- a/src/mainboard/hp/snb_ivb_laptops/dsdt.asl
+++ b/src/mainboard/hp/snb_ivb_laptops/dsdt.asl
@@ -4,7 +4,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/hp/z220_sff_workstation/dsdt.asl b/src/mainboard/hp/z220_sff_workstation/dsdt.asl
index 150bdcf05a..5fc8201391 100644
--- a/src/mainboard/hp/z220_sff_workstation/dsdt.asl
+++ b/src/mainboard/hp/z220_sff_workstation/dsdt.asl
@@ -4,7 +4,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/ibase/mb899/cstates.c b/src/mainboard/ibase/mb899/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/ibase/mb899/cstates.c
+++ b/src/mainboard/ibase/mb899/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl
index 60b5949159..8897e0464a 100644
--- a/src/mainboard/ibase/mb899/dsdt.asl
+++ b/src/mainboard/ibase/mb899/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/apollolake_rvp/dsdt.asl b/src/mainboard/intel/apollolake_rvp/dsdt.asl
index e4e121bf36..05fdd237b9 100644
--- a/src/mainboard/intel/apollolake_rvp/dsdt.asl
+++ b/src/mainboard/intel/apollolake_rvp/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 935acf17ed..b09c7146cf 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl
index 8957f752a1..0eae213c0d 100644
--- a/src/mainboard/intel/baskingridge/dsdt.asl
+++ b/src/mainboard/intel/baskingridge/dsdt.asl
@@ -3,7 +3,7 @@
#define ENABLE_TPM
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index db86877de3..3717dd041e 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c
index 5eef5eb31a..d3b1576953 100644
--- a/src/mainboard/intel/baskingridge/mainboard_smi.c
+++ b/src/mainboard/intel/baskingridge/mainboard_smi.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 <cpu/x86/smm.h>
#include <southbridge/intel/lynxpoint/nvs.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/chromeos.c b/src/mainboard/intel/cannonlake_rvp/chromeos.c
index f4a7b43842..bb88dbe80a 100644
--- a/src/mainboard/intel/cannonlake_rvp/chromeos.c
+++ b/src/mainboard/intel/cannonlake_rvp/chromeos.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 <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/dsdt.asl b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
index 23a3932a6f..0a4c4d3b34 100644
--- a/src/mainboard/intel/cannonlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/cannonlake_rvp/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/cannonlake_rvp/mainboard.c b/src/mainboard/intel/cannonlake_rvp/mainboard.c
index bde45b110c..984e7e0ef1 100644
--- a/src/mainboard/intel/cannonlake_rvp/mainboard.c
+++ b/src/mainboard/intel/cannonlake_rvp/mainboard.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 <baseboard/variants.h>
#include <device/device.h>
#include <nhlt.h>
diff --git a/src/mainboard/intel/cannonlake_rvp/smihandler.c b/src/mainboard/intel/cannonlake_rvp/smihandler.c
index 98459b6060..eec94cc446 100644
--- a/src/mainboard/intel/cannonlake_rvp/smihandler.c
+++ b/src/mainboard/intel/cannonlake_rvp/smihandler.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 <cpu/x86/smm.h>
#include <intelblocks/smihandler.h>
diff --git a/src/mainboard/intel/cedarisland_crb/dsdt.asl b/src/mainboard/intel/cedarisland_crb/dsdt.asl
index 3dc45d5f2c..6013bfb2ad 100644
--- a/src/mainboard/intel/cedarisland_crb/dsdt.asl
+++ b/src/mainboard/intel/cedarisland_crb/dsdt.asl
@@ -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/iomap.h>
DefinitionBlock(
diff --git a/src/mainboard/intel/coffeelake_rvp/chromeos.c b/src/mainboard/intel/coffeelake_rvp/chromeos.c
index 29d8fcca16..2fe308c676 100644
--- a/src/mainboard/intel/coffeelake_rvp/chromeos.c
+++ b/src/mainboard/intel/coffeelake_rvp/chromeos.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 <baseboard/variants.h>
#include <boot/coreboot_tables.h>
#include <gpio.h>
diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
index 1aa9020fcb..1fc731b520 100644
--- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/coffeelake_rvp/mainboard.c b/src/mainboard/intel/coffeelake_rvp/mainboard.c
index 1759bb95b7..0bd071572b 100644
--- a/src/mainboard/intel/coffeelake_rvp/mainboard.c
+++ b/src/mainboard/intel/coffeelake_rvp/mainboard.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 <baseboard/variants.h>
#include <device/device.h>
#include <nhlt.h>
diff --git a/src/mainboard/intel/d510mo/cstates.c b/src/mainboard/intel/d510mo/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/intel/d510mo/cstates.c
+++ b/src/mainboard/intel/d510mo/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/intel/d510mo/dsdt.asl b/src/mainboard/intel/d510mo/dsdt.asl
index 75b17df090..8746132dbe 100644
--- a/src/mainboard/intel/d510mo/dsdt.asl
+++ b/src/mainboard/intel/d510mo/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/d945gclf/cstates.c b/src/mainboard/intel/d945gclf/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/intel/d945gclf/cstates.c
+++ b/src/mainboard/intel/d945gclf/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl
index 9e3c03748c..62aa924f7f 100644
--- a/src/mainboard/intel/d945gclf/dsdt.asl
+++ b/src/mainboard/intel/d945gclf/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/dcp847ske/dsdt.asl b/src/mainboard/intel/dcp847ske/dsdt.asl
index 8f318b4817..0febac1817 100644
--- a/src/mainboard/intel/dcp847ske/dsdt.asl
+++ b/src/mainboard/intel/dcp847ske/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/dg41wv/cstates.c b/src/mainboard/intel/dg41wv/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/intel/dg41wv/cstates.c
+++ b/src/mainboard/intel/dg41wv/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/intel/dg41wv/dsdt.asl b/src/mainboard/intel/dg41wv/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/intel/dg41wv/dsdt.asl
+++ b/src/mainboard/intel/dg41wv/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/dg43gt/cstates.c b/src/mainboard/intel/dg43gt/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/intel/dg43gt/cstates.c
+++ b/src/mainboard/intel/dg43gt/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/intel/dg43gt/dsdt.asl b/src/mainboard/intel/dg43gt/dsdt.asl
index cfc0b23dc2..bdc73094d3 100644
--- a/src/mainboard/intel/dg43gt/dsdt.asl
+++ b/src/mainboard/intel/dg43gt/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 8d54aa28da..6253596926 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
index 1533583530..d72e1f9eb3 100644
--- a/src/mainboard/intel/emeraldlake2/dsdt.asl
+++ b/src/mainboard/intel/emeraldlake2/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/emeraldlake2/ec.c b/src/mainboard/intel/emeraldlake2/ec.c
index c1d2046b45..3ec74414b5 100644
--- a/src/mainboard/intel/emeraldlake2/ec.c
+++ b/src/mainboard/intel/emeraldlake2/ec.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 <types.h>
#include <console/console.h>
#include <ec/smsc/mec1308/ec.h>
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 06e3a65738..9f65b8ad7f 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/intel/emeraldlake2/smihandler.c b/src/mainboard/intel/emeraldlake2/smihandler.c
index 19575351b9..d74c98c0e1 100644
--- a/src/mainboard/intel/emeraldlake2/smihandler.c
+++ b/src/mainboard/intel/emeraldlake2/smihandler.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 <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/intel/galileo/dsdt.asl b/src/mainboard/intel/galileo/dsdt.asl
index 2c9e9c656c..786aa3692b 100644
--- a/src/mainboard/intel/galileo/dsdt.asl
+++ b/src/mainboard/intel/galileo/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl
index 11313f9336..ec70c31028 100644
--- a/src/mainboard/intel/glkrvp/dsdt.asl
+++ b/src/mainboard/intel/glkrvp/dsdt.asl
@@ -4,7 +4,7 @@
#include <variant/ec.h>
#include <variant/gpio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/glkrvp/ec.c b/src/mainboard/intel/glkrvp/ec.c
index cdafadb7ca..3a41f5d7d3 100644
--- a/src/mainboard/intel/glkrvp/ec.c
+++ b/src/mainboard/intel/glkrvp/ec.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 <console/console.h>
#include <ec/ec.h>
diff --git a/src/mainboard/intel/glkrvp/mainboard.c b/src/mainboard/intel/glkrvp/mainboard.c
index f6015a1b7d..43486fe33e 100644
--- a/src/mainboard/intel/glkrvp/mainboard.c
+++ b/src/mainboard/intel/glkrvp/mainboard.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 <baseboard/variants.h>
#include <boardid.h>
#include <console/console.h>
diff --git a/src/mainboard/intel/glkrvp/smihandler.c b/src/mainboard/intel/glkrvp/smihandler.c
index 73bf2ba0d3..42561fe099 100644
--- a/src/mainboard/intel/glkrvp/smihandler.c
+++ b/src/mainboard/intel/glkrvp/smihandler.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 <baseboard/variants.h>
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 813bad943f..f9408f1b9d 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/intel/harcuvar/dsdt.asl b/src/mainboard/intel/harcuvar/dsdt.asl
index 8c6c00d521..cf26e32905 100644
--- a/src/mainboard/intel/harcuvar/dsdt.asl
+++ b/src/mainboard/intel/harcuvar/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/harcuvar/fadt.c b/src/mainboard/intel/harcuvar/fadt.c
index 8b38b3434c..370dfd4663 100644
--- a/src/mainboard/intel/harcuvar/fadt.c
+++ b/src/mainboard/intel/harcuvar/fadt.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/acpi.h>
#include <soc/soc_util.h>
diff --git a/src/mainboard/intel/icelake_rvp/chromeos.c b/src/mainboard/intel/icelake_rvp/chromeos.c
index a2181213d9..632d10f15a 100644
--- a/src/mainboard/intel/icelake_rvp/chromeos.c
+++ b/src/mainboard/intel/icelake_rvp/chromeos.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
index b7a012fbba..440d6995cd 100644
--- a/src/mainboard/intel/icelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/icelake_rvp/dsdt.asl
@@ -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 <baseboard/ec.h>
#include <baseboard/gpio.h>
diff --git a/src/mainboard/intel/icelake_rvp/mainboard.c b/src/mainboard/intel/icelake_rvp/mainboard.c
index 41ef680d79..11c26f93ab 100644
--- a/src/mainboard/intel/icelake_rvp/mainboard.c
+++ b/src/mainboard/intel/icelake_rvp/mainboard.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 <baseboard/gpio.h>
#include <baseboard/variants.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
index c40acf29ef..8a956038b2 100644
--- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
@@ -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 <baseboard/ec.h>
#include <baseboard/gpio.h>
diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl
index 91a5c2fedc..690a705999 100644
--- a/src/mainboard/intel/kblrvp/dsdt.asl
+++ b/src/mainboard/intel/kblrvp/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/kblrvp/ec.c b/src/mainboard/intel/kblrvp/ec.c
index 52819688a1..c060bef8f2 100644
--- a/src/mainboard/intel/kblrvp/ec.c
+++ b/src/mainboard/intel/kblrvp/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index 639ad0e21b..fb2ae9b64b 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.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 <gpio.h>
#include <soc/nhlt.h>
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index 046baa74ed..d93dc31f20 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/kunimitsu/ec.c b/src/mainboard/intel/kunimitsu/ec.c
index 52819688a1..c060bef8f2 100644
--- a/src/mainboard/intel/kunimitsu/ec.c
+++ b/src/mainboard/intel/kunimitsu/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c
index 6166a33f78..833929d58b 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.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 <gpio.h>
diff --git a/src/mainboard/intel/kunimitsu/smihandler.c b/src/mainboard/intel/kunimitsu/smihandler.c
index 17837bb0ca..4c7287b136 100644
--- a/src/mainboard/intel/kunimitsu/smihandler.c
+++ b/src/mainboard/intel/kunimitsu/smihandler.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 <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
diff --git a/src/mainboard/intel/leafhill/dsdt.asl b/src/mainboard/intel/leafhill/dsdt.asl
index 11ad0bb47e..7363974716 100644
--- a/src/mainboard/intel/leafhill/dsdt.asl
+++ b/src/mainboard/intel/leafhill/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/minnow3/dsdt.asl b/src/mainboard/intel/minnow3/dsdt.asl
index 11ad0bb47e..7363974716 100644
--- a/src/mainboard/intel/minnow3/dsdt.asl
+++ b/src/mainboard/intel/minnow3/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl
index 8cff20f84d..52f3d775f0 100644
--- a/src/mainboard/intel/saddlebrook/dsdt.asl
+++ b/src/mainboard/intel/saddlebrook/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 706e107378..a3ed8d8d83 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.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/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl
index 7abbcadab9..5333193c09 100644
--- a/src/mainboard/intel/strago/dsdt.asl
+++ b/src/mainboard/intel/strago/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/strago/ec.c b/src/mainboard/intel/strago/ec.c
index 55c3e1ff3c..e009bf0927 100644
--- a/src/mainboard/intel/strago/ec.c
+++ b/src/mainboard/intel/strago/ec.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 <ec/google/chromeec/ec.h>
#include "ec.h"
diff --git a/src/mainboard/intel/strago/smihandler.c b/src/mainboard/intel/strago/smihandler.c
index 4b1a2e2624..389a8822ae 100644
--- a/src/mainboard/intel/strago/smihandler.c
+++ b/src/mainboard/intel/strago/smihandler.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 <console/console.h>
#include <cpu/x86/smm.h>
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
index 080072d4e0..c66e972639 100644
--- a/src/mainboard/intel/tglrvp/dsdt.asl
+++ b/src/mainboard/intel/tglrvp/dsdt.asl
@@ -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 <baseboard/ec.h>
#include <baseboard/gpio.h>
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index e06e42b1cc..9458a29c0a 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl
index 18609ac9f7..528f365784 100644
--- a/src/mainboard/intel/wtm2/dsdt.asl
+++ b/src/mainboard/intel/wtm2/dsdt.asl
@@ -3,7 +3,7 @@
#define ENABLE_TPM
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 026a28dc2f..5b0e36717a 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
index d7dc69a34d..eea2b4d55d 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
index 441f38f619..244ee5f786 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/kontron/986lcd-m/cstates.c b/src/mainboard/kontron/986lcd-m/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/kontron/986lcd-m/cstates.c
+++ b/src/mainboard/kontron/986lcd-m/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl
index 1a8513120e..ee74281d2f 100644
--- a/src/mainboard/kontron/986lcd-m/dsdt.asl
+++ b/src/mainboard/kontron/986lcd-m/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl
index 298f30f782..de21e4249f 100644
--- a/src/mainboard/kontron/ktqm77/dsdt.asl
+++ b/src/mainboard/kontron/ktqm77/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/g505s/dsdt.asl b/src/mainboard/lenovo/g505s/dsdt.asl
index bb700e0de1..a9715d10a3 100644
--- a/src/mainboard/lenovo/g505s/dsdt.asl
+++ b/src/mainboard/lenovo/g505s/dsdt.asl
@@ -4,7 +4,7 @@
#include "mainboard.h"
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/lenovo/g505s/mainboard.c b/src/mainboard/lenovo/g505s/mainboard.c
index c8ce7fdc53..312a621f19 100644
--- a/src/mainboard/lenovo/g505s/mainboard.c
+++ b/src/mainboard/lenovo/g505s/mainboard.c
@@ -3,7 +3,7 @@
#include "ec.h"
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/lenovo/l520/dsdt.asl b/src/mainboard/lenovo/l520/dsdt.asl
index 0ab2c2f7c2..ab26ba784f 100644
--- a/src/mainboard/lenovo/l520/dsdt.asl
+++ b/src/mainboard/lenovo/l520/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/s230u/dsdt.asl b/src/mainboard/lenovo/s230u/dsdt.asl
index 2b9357e818..37ad7b8b79 100644
--- a/src/mainboard/lenovo/s230u/dsdt.asl
+++ b/src/mainboard/lenovo/s230u/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/s230u/mainboard.c b/src/mainboard/lenovo/s230u/mainboard.c
index 94d192d3e1..10f72a61f9 100644
--- a/src/mainboard/lenovo/s230u/mainboard.c
+++ b/src/mainboard/lenovo/s230u/mainboard.c
@@ -10,7 +10,7 @@
#include <smbios.h>
#include "ec.h"
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
static u8 mainboard_fill_ec_version(char *buf, u8 buf_len)
{
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 653365ab2b..de7c9f97c4 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h>
diff --git a/src/mainboard/lenovo/t400/cstates.c b/src/mainboard/lenovo/t400/cstates.c
index 81fb3d59ce..cbcf739430 100644
--- a/src/mainboard/lenovo/t400/cstates.c
+++ b/src/mainboard/lenovo/t400/cstates.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>
static acpi_cstate_t cst_entries[] = {
{
diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl
index 001e91ece2..9144ad200d 100644
--- a/src/mainboard/lenovo/t400/dsdt.asl
+++ b/src/mainboard/lenovo/t400/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t400/fadt.c b/src/mainboard/lenovo/t400/fadt.c
index 840dcd0a42..f2d70fcbba 100644
--- a/src/mainboard/lenovo/t400/fadt.c
+++ b/src/mainboard/lenovo/t400/fadt.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/smm.h>
#include <version.h>
diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl
index c2624d4195..cecb4bde40 100644
--- a/src/mainboard/lenovo/t410/dsdt.asl
+++ b/src/mainboard/lenovo/t410/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t410/mainboard.c b/src/mainboard/lenovo/t410/mainboard.c
index 63bfaf272f..bf45672aca 100644
--- a/src/mainboard/lenovo/t410/mainboard.c
+++ b/src/mainboard/lenovo/t410/mainboard.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <drivers/intel/gma/int15.h>
#include "dock.h"
diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/t420/dsdt.asl
+++ b/src/mainboard/lenovo/t420/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/t420s/dsdt.asl
+++ b/src/mainboard/lenovo/t420s/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t430/dsdt.asl b/src/mainboard/lenovo/t430/dsdt.asl
index 583f9f3b8c..48a26e1c00 100644
--- a/src/mainboard/lenovo/t430/dsdt.asl
+++ b/src/mainboard/lenovo/t430/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/t430s/dsdt.asl
+++ b/src/mainboard/lenovo/t430s/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t440p/dsdt.asl b/src/mainboard/lenovo/t440p/dsdt.asl
index 94e70433df..3be8bda159 100644
--- a/src/mainboard/lenovo/t440p/dsdt.asl
+++ b/src/mainboard/lenovo/t440p/dsdt.asl
@@ -19,7 +19,7 @@
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define THINKPAD_EC_GPE 17
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl
index 51ff3361b2..222a5f9243 100644
--- a/src/mainboard/lenovo/t60/dsdt.asl
+++ b/src/mainboard/lenovo/t60/dsdt.asl
@@ -6,7 +6,7 @@
#define BRIGHTNESS_DOWN \BRTD
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index aba0a9bfe8..846aa07d36 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -9,7 +9,7 @@
#include <northbridge/intel/i945/i945.h>
#include <southbridge/intel/i82801gx/chip.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
diff --git a/src/mainboard/lenovo/thinkcentre_a58/cstates.c b/src/mainboard/lenovo/thinkcentre_a58/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/cstates.c
+++ b/src/mainboard/lenovo/thinkcentre_a58/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl b/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
index 8880ba7076..8e1656b224 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
+++ b/src/mainboard/lenovo/thinkcentre_a58/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x131e/dsdt.asl b/src/mainboard/lenovo/x131e/dsdt.asl
index 1c237fef40..bdacd20b5b 100644
--- a/src/mainboard/lenovo/x131e/dsdt.asl
+++ b/src/mainboard/lenovo/x131e/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
index ce856126cd..de195e6aca 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
+++ b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl
@@ -8,7 +8,7 @@
#define EC_LENOVO_H8_ME_WORKAROUND 1
#define EC_LENOVO_H8_ALT_FN_F2F3_LAYOUT 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 653365ab2b..de7c9f97c4 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h>
diff --git a/src/mainboard/lenovo/x200/cstates.c b/src/mainboard/lenovo/x200/cstates.c
index 81fb3d59ce..cbcf739430 100644
--- a/src/mainboard/lenovo/x200/cstates.c
+++ b/src/mainboard/lenovo/x200/cstates.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>
static acpi_cstate_t cst_entries[] = {
{
diff --git a/src/mainboard/lenovo/x200/dsdt.asl b/src/mainboard/lenovo/x200/dsdt.asl
index abe1c27360..9f6f22de33 100644
--- a/src/mainboard/lenovo/x200/dsdt.asl
+++ b/src/mainboard/lenovo/x200/dsdt.asl
@@ -6,7 +6,7 @@
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x200/fadt.c b/src/mainboard/lenovo/x200/fadt.c
index 840dcd0a42..f2d70fcbba 100644
--- a/src/mainboard/lenovo/x200/fadt.c
+++ b/src/mainboard/lenovo/x200/fadt.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/smm.h>
#include <version.h>
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index c2624d4195..cecb4bde40 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/x220/dsdt.asl
+++ b/src/mainboard/lenovo/x220/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x220/early_init.c b/src/mainboard/lenovo/x220/early_init.c
index 4efe15a03f..a7716a507f 100644
--- a/src/mainboard/lenovo/x220/early_init.c
+++ b/src/mainboard/lenovo/x220/early_init.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <northbridge/intel/sandybridge/raminit.h>
#include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl
index a03b252ef5..0eedf51163 100644
--- a/src/mainboard/lenovo/x230/dsdt.asl
+++ b/src/mainboard/lenovo/x230/dsdt.asl
@@ -7,7 +7,7 @@
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
#define EC_LENOVO_H8_ME_WORKAROUND 1
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl
index 78a51d3435..42a8d91a93 100644
--- a/src/mainboard/lenovo/x60/dsdt.asl
+++ b/src/mainboard/lenovo/x60/dsdt.asl
@@ -6,7 +6,7 @@
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 14080f5f05..5d129bb360 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -12,7 +12,7 @@
#include "dock.h"
#include <drivers/intel/gma/int15.h>
#include <drivers/lenovo/lenovo.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
diff --git a/src/mainboard/libretrend/lt1000/dsdt.asl b/src/mainboard/libretrend/lt1000/dsdt.asl
index 624806ca04..77b1afe7f9 100644
--- a/src/mainboard/libretrend/lt1000/dsdt.asl
+++ b/src/mainboard/libretrend/lt1000/dsdt.asl
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
index 5ce62c7cff..aa7864832f 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
index a53490323a..495f7a8647 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 2c56e08464..4c4f0a8725 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/lippert/toucan-af/acpi/routing.asl b/src/mainboard/lippert/toucan-af/acpi/routing.asl
index ae3c0008bb..62180ea2f7 100644
--- a/src/mainboard/lippert/toucan-af/acpi/routing.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/lippert/toucan-af/acpi/usb.asl b/src/mainboard/lippert/toucan-af/acpi/usb.asl
index a53490323a..495f7a8647 100644
--- a/src/mainboard/lippert/toucan-af/acpi/usb.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/usb.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl
index 14aa8654b9..3422ee0a92 100644
--- a/src/mainboard/lippert/toucan-af/dsdt.asl
+++ b/src/mainboard/lippert/toucan-af/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/msi/ms7707/dsdt.asl b/src/mainboard/msi/ms7707/dsdt.asl
index ca6f5a0d3a..e46f606b6a 100644
--- a/src/mainboard/msi/ms7707/dsdt.asl
+++ b/src/mainboard/msi/ms7707/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/msi/ms7721/acpi/cpstate.asl b/src/mainboard/msi/ms7721/acpi/cpstate.asl
index 86361521a2..9e7fdcf706 100644
--- a/src/mainboard/msi/ms7721/acpi/cpstate.asl
+++ b/src/mainboard/msi/ms7721/acpi/cpstate.asl
@@ -7,7 +7,7 @@
* characteristics.
*/
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001)
{
Scope (\_SB) {
diff --git a/src/mainboard/msi/ms7721/acpi_tables.c b/src/mainboard/msi/ms7721/acpi_tables.c
index 3eb63c8920..a311f72b80 100644
--- a/src/mainboard/msi/ms7721/acpi_tables.c
+++ b/src/mainboard/msi/ms7721/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/msi/ms7721/dsdt.asl b/src/mainboard/msi/ms7721/dsdt.asl
index 5fb15eac9a..d14091792e 100644
--- a/src/mainboard/msi/ms7721/dsdt.asl
+++ b/src/mainboard/msi/ms7721/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/ocp/sonorapass/dsdt.asl b/src/mainboard/ocp/sonorapass/dsdt.asl
index 3dc45d5f2c..6013bfb2ad 100644
--- a/src/mainboard/ocp/sonorapass/dsdt.asl
+++ b/src/mainboard/ocp/sonorapass/dsdt.asl
@@ -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/iomap.h>
DefinitionBlock(
diff --git a/src/mainboard/ocp/tiogapass/dsdt.asl b/src/mainboard/ocp/tiogapass/dsdt.asl
index 9d33865271..717597c379 100644
--- a/src/mainboard/ocp/tiogapass/dsdt.asl
+++ b/src/mainboard/ocp/tiogapass/dsdt.asl
@@ -14,7 +14,7 @@
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/ocp/tiogapass/fadt.c b/src/mainboard/ocp/tiogapass/fadt.c
index 00a54db816..f6fb273747 100644
--- a/src/mainboard/ocp/tiogapass/fadt.c
+++ b/src/mainboard/ocp/tiogapass/fadt.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <soc/acpi.h>
void motherboard_fill_fadt(acpi_fadt_t *fadt)
diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl
index f14a9eeda9..db71348823 100644
--- a/src/mainboard/packardbell/ms2290/dsdt.asl
+++ b/src/mainboard/packardbell/ms2290/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/pcengines/apu1/acpi/routing.asl b/src/mainboard/pcengines/apu1/acpi/routing.asl
index d318bfc9d8..a6f72e4b46 100644
--- a/src/mainboard/pcengines/apu1/acpi/routing.asl
+++ b/src/mainboard/pcengines/apu1/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
index 27a737c730..734f821bba 100644
--- a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
+++ b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index 02afbdbc5a..de2336efad 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/pcengines/apu1/dsdt.asl b/src/mainboard/pcengines/apu1/dsdt.asl
index 97e0e28143..e5a4ecef5e 100644
--- a/src/mainboard/pcengines/apu1/dsdt.asl
+++ b/src/mainboard/pcengines/apu1/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/pcengines/apu2/acpi/routing.asl b/src/mainboard/pcengines/apu2/acpi/routing.asl
index 7167de7477..cf0961af68 100644
--- a/src/mainboard/pcengines/apu2/acpi/routing.asl
+++ b/src/mainboard/pcengines/apu2/acpi/routing.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/pcengines/apu2/acpi/usb_oc.asl b/src/mainboard/pcengines/apu2/acpi/usb_oc.asl
index b7757d3950..f6d8c9226b 100644
--- a/src/mainboard/pcengines/apu2/acpi/usb_oc.asl
+++ b/src/mainboard/pcengines/apu2/acpi/usb_oc.asl
@@ -3,7 +3,7 @@
/* simple name description */
/*
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001
)
{
diff --git a/src/mainboard/pcengines/apu2/acpi_tables.c b/src/mainboard/pcengines/apu2/acpi_tables.c
index 243a4a621d..16df3ea104 100644
--- a/src/mainboard/pcengines/apu2/acpi_tables.c
+++ b/src/mainboard/pcengines/apu2/acpi_tables.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/ioapic.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/pcengines/apu2/dsdt.asl b/src/mainboard/pcengines/apu2/dsdt.asl
index cc6c03d08a..8827a3727f 100644
--- a/src/mainboard/pcengines/apu2/dsdt.asl
+++ b/src/mainboard/pcengines/apu2/dsdt.asl
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
/* DefinitionBlock Statement */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock (
"DSDT.AML", /* Output filename */
"DSDT", /* Signature */
diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c
index ae5aaf1f0f..45fb909057 100644
--- a/src/mainboard/portwell/m107/acpi_tables.c
+++ b/src/mainboard/portwell/m107/acpi_tables.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/ioapic.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/portwell/m107/dsdt.asl b/src/mainboard/portwell/m107/dsdt.asl
index cecd8bc606..d00b1b1a8f 100644
--- a/src/mainboard/portwell/m107/dsdt.asl
+++ b/src/mainboard/portwell/m107/dsdt.asl
@@ -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>
#define SDCARD_CD 81 /* Not used */
diff --git a/src/mainboard/protectli/vault_bsw/dsdt.asl b/src/mainboard/protectli/vault_bsw/dsdt.asl
index 34f93fa229..8e0c7a9cc1 100644
--- a/src/mainboard/protectli/vault_bsw/dsdt.asl
+++ b/src/mainboard/protectli/vault_bsw/dsdt.asl
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/protectli/vault_kbl/dsdt.asl b/src/mainboard/protectli/vault_kbl/dsdt.asl
index 624806ca04..77b1afe7f9 100644
--- a/src/mainboard/protectli/vault_kbl/dsdt.asl
+++ b/src/mainboard/protectli/vault_kbl/dsdt.asl
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/purism/librem_bdw/acpi_tables.c b/src/mainboard/purism/librem_bdw/acpi_tables.c
index 84263cc397..cc3b003e52 100644
--- a/src/mainboard/purism/librem_bdw/acpi_tables.c
+++ b/src/mainboard/purism/librem_bdw/acpi_tables.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/ioapic.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
diff --git a/src/mainboard/purism/librem_bdw/dsdt.asl b/src/mainboard/purism/librem_bdw/dsdt.asl
index 9f4aa03db1..be2b3066ff 100644
--- a/src/mainboard/purism/librem_bdw/dsdt.asl
+++ b/src/mainboard/purism/librem_bdw/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/purism/librem_skl/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl
index 5ef19e12f6..43c6983f30 100644
--- a/src/mainboard/purism/librem_skl/dsdt.asl
+++ b/src/mainboard/purism/librem_skl/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
index 1900877096..1d97b24450 100644
--- a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
+++ b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
diff --git a/src/mainboard/roda/rk886ex/cstates.c b/src/mainboard/roda/rk886ex/cstates.c
index 10498e1150..f52dae852a 100644
--- a/src/mainboard/roda/rk886ex/cstates.c
+++ b/src/mainboard/roda/rk886ex/cstates.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>
int get_cst_entries(acpi_cstate_t **entries)
{
diff --git a/src/mainboard/roda/rk886ex/dsdt.asl b/src/mainboard/roda/rk886ex/dsdt.asl
index c58f89558c..a7ae9e83af 100644
--- a/src/mainboard/roda/rk886ex/dsdt.asl
+++ b/src/mainboard/roda/rk886ex/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index fca8cb7953..04b9632a69 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h>
diff --git a/src/mainboard/roda/rk9/cstates.c b/src/mainboard/roda/rk9/cstates.c
index 6fb09967f0..f994143884 100644
--- a/src/mainboard/roda/rk9/cstates.c
+++ b/src/mainboard/roda/rk9/cstates.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>
static acpi_cstate_t cst_entries[] = {
{
diff --git a/src/mainboard/roda/rk9/dsdt.asl b/src/mainboard/roda/rk9/dsdt.asl
index de5b1dd2b9..a1cb6e35b3 100644
--- a/src/mainboard/roda/rk9/dsdt.asl
+++ b/src/mainboard/roda/rk9/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/roda/rk9/fadt.c b/src/mainboard/roda/rk9/fadt.c
index edcb3539b1..5f4bf1b2e0 100644
--- a/src/mainboard/roda/rk9/fadt.c
+++ b/src/mainboard/roda/rk9/fadt.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/smm.h>
#include <version.h>
diff --git a/src/mainboard/roda/rv11/dsdt.asl b/src/mainboard/roda/rv11/dsdt.asl
index ae251a16d1..eba6d32ed2 100644
--- a/src/mainboard/roda/rv11/dsdt.asl
+++ b/src/mainboard/roda/rv11/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 7e6e5593d1..ca2f560bf5 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <ec/acpi/ec.h>
diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl
index 10aa1f7453..9d5c7c654e 100644
--- a/src/mainboard/samsung/lumpy/dsdt.asl
+++ b/src/mainboard/samsung/lumpy/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/samsung/lumpy/ec.c b/src/mainboard/samsung/lumpy/ec.c
index 9e7e5bba42..c3bce8a490 100644
--- a/src/mainboard/samsung/lumpy/ec.c
+++ b/src/mainboard/samsung/lumpy/ec.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 <types.h>
#include <console/console.h>
#include <ec/smsc/mec1308/ec.h>
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 3fe88fb053..2fb012d391 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <ec/smsc/mec1308/ec.h>
#include "ec.h"
#include "onboard.h"
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index 99efad94b0..74e044d71f 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <vendorcode/google/chromeos/gnvs.h>
diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl
index b5bb0ef684..3585db1ab3 100644
--- a/src/mainboard/samsung/stumpy/dsdt.asl
+++ b/src/mainboard/samsung/stumpy/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 9b56890403..dede546349 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -3,7 +3,7 @@
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <southbridge/intel/bd82x6x/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/samsung/stumpy/smihandler.c b/src/mainboard/samsung/stumpy/smihandler.c
index 3f511a16c5..1f9c748b3b 100644
--- a/src/mainboard/samsung/stumpy/smihandler.c
+++ b/src/mainboard/samsung/stumpy/smihandler.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 <cpu/x86/smm.h>
#include <southbridge/intel/bd82x6x/nvs.h>
diff --git a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
index 8b23ee7b85..72204e089d 100644
--- a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
+++ b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl
@@ -16,7 +16,7 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 813bad943f..f9408f1b9d 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <cpu/x86/msr.h>
diff --git a/src/mainboard/scaleway/tagada/dsdt.asl b/src/mainboard/scaleway/tagada/dsdt.asl
index 8c6c00d521..cf26e32905 100644
--- a/src/mainboard/scaleway/tagada/dsdt.asl
+++ b/src/mainboard/scaleway/tagada/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/scaleway/tagada/fadt.c b/src/mainboard/scaleway/tagada/fadt.c
index 8b38b3434c..370dfd4663 100644
--- a/src/mainboard/scaleway/tagada/fadt.c
+++ b/src/mainboard/scaleway/tagada/fadt.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/acpi.h>
#include <soc/soc_util.h>
diff --git a/src/mainboard/siemens/mc_apl1/dsdt.asl b/src/mainboard/siemens/mc_apl1/dsdt.asl
index a13f387a95..6a824dfd74 100644
--- a/src/mainboard/siemens/mc_apl1/dsdt.asl
+++ b/src/mainboard/siemens/mc_apl1/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/supermicro/x10slm-f/dsdt.asl b/src/mainboard/supermicro/x10slm-f/dsdt.asl
index 9b4cb92bfb..deed223366 100644
--- a/src/mainboard/supermicro/x10slm-f/dsdt.asl
+++ b/src/mainboard/supermicro/x10slm-f/dsdt.asl
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock("dsdt.aml", "DSDT", 2, OEM_ID, ACPI_TABLE_CREATOR, 0x20181220)
{
diff --git a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
index 8cff20f84d..52f3d775f0 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
+++ b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/supermicro/x9scl/dsdt.asl b/src/mainboard/supermicro/x9scl/dsdt.asl
index b6c8930cb6..e1dc9db971 100644
--- a/src/mainboard/supermicro/x9scl/dsdt.asl
+++ b/src/mainboard/supermicro/x9scl/dsdt.asl
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This file is part of the coreboot project. */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/system76/lemp9/dsdt.asl b/src/mainboard/system76/lemp9/dsdt.asl
index 64d5399011..818b05a5cb 100644
--- a/src/mainboard/system76/lemp9/dsdt.asl
+++ b/src/mainboard/system76/lemp9/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/mainboard/up/squared/dsdt.asl b/src/mainboard/up/squared/dsdt.asl
index 11ad0bb47e..7363974716 100644
--- a/src/mainboard/up/squared/dsdt.asl
+++ b/src/mainboard/up/squared/dsdt.asl
@@ -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>
DefinitionBlock(
"dsdt.aml",
"DSDT",
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 9700ff727d..30755d13bc 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -3,8 +3,8 @@
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index e861b9804d..5a2f266fde 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -3,8 +3,8 @@
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index 7852b5eb3a..dd07aa5463 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -3,8 +3,8 @@
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 1ead42c92e..5d832eaf4b 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
@@ -18,7 +18,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/msr.h>
#include <cpu/amd/mtrr.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <northbridge/amd/pi/nb_common.h>
#include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index e3d753a93d..8bb64b761a 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <stdint.h>
#include <device/device.h>
#include <device/pci.h>
@@ -18,7 +18,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/msr.h>
#include <cpu/amd/mtrr.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <northbridge/amd/pi/nb_common.h>
#include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index fa49fc934e..74fd8c61b1 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -4,8 +4,8 @@
#include <commonlib/helpers.h>
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
-#include <arch/acpi_ivrs.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_ivrs.h>
#include <arch/ioapic.h>
#include <stdint.h>
#include <device/device.h>
@@ -22,7 +22,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/msr.h>
#include <cpu/amd/mtrr.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <northbridge/amd/pi/nb_common.h>
#include <northbridge/amd/agesa/agesa_helper.h>
#include <southbridge/amd/pi/hudson/pci_devs.h>
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 03230a53ae..e8944669a3 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.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/pci_ops.h>
#include <stdint.h>
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index bdd0ed0822..c81d21f0d0 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 5f6c8a1c4f..d566120827 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <device/device.h>
#include <boot/tables.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/intel/smm_reloc.h>
#include "chip.h"
diff --git a/src/northbridge/intel/gm45/romstage.c b/src/northbridge/intel/gm45/romstage.c
index 5b68a7398a..9bfb4e99bb 100644
--- a/src/northbridge/intel/gm45/romstage.c
+++ b/src/northbridge/intel/gm45/romstage.c
@@ -5,7 +5,7 @@
#include <romstage_handoff.h>
#include <console/console.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/lapic.h>
#include <arch/romstage.h>
#include <northbridge/intel/gm45/gm45.h>
diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c
index f4d9d65421..a66847d6a9 100644
--- a/src/northbridge/intel/haswell/acpi.c
+++ b/src/northbridge/intel/haswell/acpi.c
@@ -3,7 +3,7 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci_ops.h>
#include "haswell.h"
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index f7c6883852..552f032de5 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -3,7 +3,7 @@
#include <commonlib/helpers.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <stdint.h>
#include <delay.h>
#include <cpu/intel/haswell/haswell.h>
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index e1258e04aa..1c7eabcb57 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -2,8 +2,8 @@
/* This file is part of the coreboot project. */
#include <types.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/pci_ops.h>
#include "i945.h"
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 3fd3db69df..c080d0cbd5 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -8,7 +8,7 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/intel/smm_reloc.h>
#include "i945.h"
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index c1ee207bf1..7384223c0d 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.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/northbridge/intel/pineview/acpi.c b/src/northbridge/intel/pineview/acpi.c
index 54c42cf481..cf91f1ea65 100644
--- a/src/northbridge/intel/pineview/acpi.c
+++ b/src/northbridge/intel/pineview/acpi.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 <device/device.h>
#include <northbridge/intel/pineview/pineview.h>
#include <types.h>
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index b24356361f..af4bfb8ef5 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <device/device.h>
#include <boot/tables.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/intel/pineview/pineview.h>
#include <cpu/intel/smm_reloc.h>
diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c
index 77aa8149da..3ae44b8b36 100644
--- a/src/northbridge/intel/sandybridge/acpi.c
+++ b/src/northbridge/intel/sandybridge/acpi.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <console/console.h>
#include <commonlib/helpers.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci_ops.h>
#include "sandybridge.h"
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index ea2a737c2c..e947bc5613 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.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/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c
index fb1ebab753..67fc93334b 100644
--- a/src/northbridge/intel/x4x/acpi.c
+++ b/src/northbridge/intel/x4x/acpi.c
@@ -3,8 +3,8 @@
#include <types.h>
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include "x4x.h"
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 054d2aa2ed..8aab1f63bd 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <device/device.h>
#include <boot/tables.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <northbridge/intel/x4x/iomap.h>
#include <northbridge/intel/x4x/chip.h>
#include <northbridge/intel/x4x/x4x.h>
diff --git a/src/security/memory/memory_clear.c b/src/security/memory/memory_clear.c
index 75c31abace..4504780f48 100644
--- a/src/security/memory/memory_clear.c
+++ b/src/security/memory/memory_clear.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <security/memory/memory.h>
#include <cbmem.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
/* Helper to find free space for memset_pae. */
static uintptr_t get_free_memory_range(struct memranges *mem,
diff --git a/src/soc/amd/common/block/acpi/acpi.c b/src/soc/amd/common/block/acpi/acpi.c
index 9d8da6e4a3..105d77b0f6 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 6715a43296..a3f8a969e6 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 2028f09335..00a5aea977 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 71e29cdd22..3304f93e7f 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 2d7954fba2..8d4ff6c449 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 6cdae6b5ab..663f1e7629 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 191e79903e..5221b7486a 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 1959d3d860..b4954c8818 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 8e34c85f52..357dbcacb8 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 7c6823239c..c206b2e054 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 09e9b6b4b4..15af741ea1 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 25dab397c0..454d0c2283 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 68321fffae..c90ce468f1 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 cdea0058a8..64e61c04e8 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 35d46bcfb6..0f484d22b6 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 a38acf2461..1db9d00a5d 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 329429ef48..8af5821ef2 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 d399c7d230..cf04c2eace 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 cc9f634959..15b48583fe 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 22c8cc6547..ad89df437f 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 09e9b6b4b4..15af741ea1 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 852930a88d..5206b40537 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 6a74f22f58..95477489b6 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 44f43b4717..14559b9b99 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 2aa16b6853..135abefe91 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 a38acf2461..1db9d00a5d 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 9c3154107a..131a268993 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 2b8afa7a88..6e5e79bded 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 93c8792c3e..944d853646 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 c4e068d41f..0b2de52fbb 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 73f5614852..1e60683b37 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 e375f409f5..3b41d73a18 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 b3ee7a0d49..207d1ef6d8 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 3d0d4593dd..4a33b6c63e 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 426c2de95a..eb94d39f59 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 dc9855ddf8..06534d06ab 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 1401649552..6ce90a4b5a 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 3da67ebf76..842049a283 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 0161f67038..274e7a75b6 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 d83be9f826..64d528f1cb 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 aa56a2ebb2..e815a9730d 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 9036e103fc..7147f18449 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 5f6dce875f..39803dea4e 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 3ebf8fff2a..68b8c0e0bb 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 3f83e08a4c..7f651b30ee 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 473be2fcc3..347c796414 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 1c9d6b3e9b..0954e58c95 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 615117c613..6f35d064dd 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 997b7e920c..ef476456af 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 f3397aaa4b..2ca2b5d1b1 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 3222faf814..5dca249e0b 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 1ca8bdaccc..aaa6e480f9 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 e2d9a3b101..5d6ecab8c4 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 9b5784c2b5..14c42022dc 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 503e1799b5..8afdba158a 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 b030d44c39..294fbdef9d 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 2d39707f78..049393c9a5 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 ea6beb15f1..5f512b8d4e 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 af3be9e132..4b4969ccb4 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 afe9c82705..e6f3849f03 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 910df61795..cecac7fe4b 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 a0c6e4f497..2849d3c254 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 f54a4947a2..8c0b726bd3 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 8b5dc0cc60..ac1008b2b1 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 2eb82a20a8..10fa9214b9 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 39f3fe1de6..5604186c11 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 1ecbb67098..57270b428b 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 7d4fcc39c9..4068ea10e9 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 9ac03c99ad..eac68ab9c2 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 e426fae95e..905032fa77 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 4e28b44740..d3e109f936 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 cb10f1f10d..2d0fecf3b0 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 d0a160de29..25ce242354 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 d466e3684b..c7a70e6fc7 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 9a0387b493..731c50b195 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 00946b304d..57f39f02e3 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 8e44738da5..be7fd2033f 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 9498060c5e..3c607e5ab6 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 c293f8ab08..bab2c0f436 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 77262b6036..bb0aea0c98 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 5b21018b6c..845a8ce0cd 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 6f43288457..1d4bcfc520 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 fbe2b8264f..16175e7317 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 ae184e92b0..b9edfea63c 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 9e03c03432..04d0fccf0e 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 b1f045a821..e976b8d772 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 2ba4531deb..d868d3eef2 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 ca74ab3b08..5bc4ff21a6 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 b8192c95b6..175b3ceefa 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 cb59a21b7b..be7198fdfa 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 b390968708..6db6ec8440 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 b8192c95b6..175b3ceefa 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 f1da3a81f4..10a658658d 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 1b8dfa0b3d..6dccc3044a 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 2c0df5eaf4..4ce4cb5058 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 5ba683f47b..789af1d9e6 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 9df078bad8..b731baff8d 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 892f26212b..387bd6fe3d 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 f63220e13b..9b0369773d 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 94b8d3e447..083783f346 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 649cb25b58..f9dfa8b2b5 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 a331b722a7..58c8e9ccf1 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 eaa07c394a..bbf36ca6a3 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 3004b4a732..c42e280ed1 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 0fe471c558..6260c73eb1 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 a7a4c54e7f..f0b7ddf110 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 9c5c7495f2..98cdd99545 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 a34cd39698..3d32cd104a 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 8ba4b29688..a27550c90c 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 {
diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c
index 0baaa9c5c8..be724434cb 100644
--- a/src/southbridge/amd/agesa/hudson/fadt.c
+++ b/src/southbridge/amd/agesa/hudson/fadt.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <version.h>
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 0b579842a6..56879a3418 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -13,7 +13,7 @@
#include <pc80/isa-dma.h>
#include <arch/io.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <pc80/i8254.h>
#include <pc80/i8259.h>
#include "hudson.h"
diff --git a/src/southbridge/amd/agesa/hudson/ramtop.c b/src/southbridge/amd/agesa/hudson/ramtop.c
index 46ce0cf07b..eeb37809fc 100644
--- a/src/southbridge/amd/agesa/hudson/ramtop.c
+++ b/src/southbridge/amd/agesa/hudson/ramtop.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include "hudson.h"
int acpi_get_sleep_type(void)
diff --git a/src/southbridge/amd/cimx/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index cf7f3f5fa5..256a9c5b7b 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
@@ -5,7 +5,7 @@
#include "cfg.h"
#include <OEM.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
/**
* @brief South Bridge CIMx configuration
diff --git a/src/southbridge/amd/cimx/sb800/fadt.c b/src/southbridge/amd/cimx/sb800/fadt.c
index 5cb1695c85..67de34829c 100644
--- a/src/southbridge/amd/cimx/sb800/fadt.c
+++ b/src/southbridge/amd/cimx/sb800/fadt.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <device/device.h>
#include <version.h>
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index e4a1795ab4..b0ee037ae2 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -14,7 +14,7 @@
#include <pc80/i8254.h>
#include <pc80/i8259.h>
#include <console/console.h> /* printk */
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/pci_ehci.h>
#include "lpc.h" /* lpc_read_resources */
#include "SBPLATFORM.h" /* Platform Specific Definitions */
diff --git a/src/southbridge/amd/cimx/sb800/ramtop.c b/src/southbridge/amd/cimx/sb800/ramtop.c
index 25259eeacf..d25f391b13 100644
--- a/src/southbridge/amd/cimx/sb800/ramtop.c
+++ b/src/southbridge/amd/cimx/sb800/ramtop.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cbmem.h>
#include "SBPLATFORM.h"
diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c
index 15fd6bb0c9..23239dd213 100644
--- a/src/southbridge/amd/pi/hudson/fadt.c
+++ b/src/southbridge/amd/pi/hudson/fadt.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <version.h>
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index 3a6b541733..00c8900550 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -5,7 +5,7 @@
#include <console/console.h>
#include <arch/io.h>
#include <device/mmio.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_def.h>
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index c50758256b..c8f37a470a 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -13,7 +13,7 @@
#include <pc80/isa-dma.h>
#include <arch/io.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <pc80/i8254.h>
#include <pc80/i8259.h>
#include <types.h>
diff --git a/src/southbridge/intel/bd82x6x/elog.c b/src/southbridge/intel/bd82x6x/elog.c
index dc5da793a3..241c1a0d83 100644
--- a/src/southbridge/intel/bd82x6x/elog.c
+++ b/src/southbridge/intel/bd82x6x/elog.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 35d71a4d07..1100544707 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -12,8 +12,8 @@
#include <pc80/i8259.h>
#include <arch/io.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <cpu/x86/smm.h>
#include <cbmem.h>
#include <string.h>
diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index b1f3bfe861..ae62638f1b 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/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/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 054c29f565..d240bf65d5 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.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/device.h>
#include <device/pci.h>
diff --git a/src/southbridge/intel/bd82x6x/pch.h b/src/southbridge/intel/bd82x6x/pch.h
index 0a236c6b7e..a452263645 100644
--- a/src/southbridge/intel/bd82x6x/pch.h
+++ b/src/southbridge/intel/bd82x6x/pch.h
@@ -4,7 +4,7 @@
#ifndef SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
#define SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
/* PCH types */
#define PCH_TYPE_CPT 0x1c /* CougarPoint */
diff --git a/src/southbridge/intel/common/acpi_pirq_gen.c b/src/southbridge/intel/common/acpi_pirq_gen.c
index 20dafdfd38..d1a00f4498 100644
--- a/src/southbridge/intel/common/acpi_pirq_gen.c
+++ b/src/southbridge/intel/common/acpi_pirq_gen.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 <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/southbridge/intel/common/madt.c b/src/southbridge/intel/common/madt.c
index d425a74366..fe65afaea2 100644
--- a/src/southbridge/intel/common/madt.c
+++ b/src/southbridge/intel/common/madt.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/ioapic.h>
#include <arch/smp/mpspec.h>
diff --git a/src/southbridge/intel/common/pciehp.c b/src/southbridge/intel/common/pciehp.c
index e5bbdab2fb..4f77bb0086 100644
--- a/src/southbridge/intel/common/pciehp.c
+++ b/src/southbridge/intel/common/pciehp.c
@@ -2,8 +2,8 @@
/* This file is part of the coreboot project. */
#include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/southbridge/intel/common/pmbase.c b/src/southbridge/intel/common/pmbase.c
index 6175302d54..d78e9cd2e8 100644
--- a/src/southbridge/intel/common/pmbase.c
+++ b/src/southbridge/intel/common/pmbase.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/pci_ops.h>
diff --git a/src/southbridge/intel/common/pmclib.c b/src/southbridge/intel/common/pmclib.c
index d44d6195ce..72df0ff86a 100644
--- a/src/southbridge/intel/common/pmclib.c
+++ b/src/southbridge/intel/common/pmclib.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 <console/console.h>
#include "pmclib.h"
diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c
index 7b27ce0cd5..3e3dca94f8 100644
--- a/src/southbridge/intel/common/smihandler.c
+++ b/src/southbridge/intel/common/smihandler.c
@@ -4,7 +4,7 @@
#include <types.h>
#include <arch/io.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <cpu/x86/cache.h>
#include <device/pci_def.h>
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index 96fcefcebb..4b29e0fe4d 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -2,8 +2,8 @@
/* This file is part of the coreboot project. */
#include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include "i82371eb.h"
diff --git a/src/southbridge/intel/i82371eb/fadt.c b/src/southbridge/intel/i82371eb/fadt.c
index db1071a041..03bbdccb76 100644
--- a/src/southbridge/intel/i82371eb/fadt.c
+++ b/src/southbridge/intel/i82371eb/fadt.c
@@ -16,7 +16,7 @@
*/
#include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci.h>
#include <version.h>
diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c
index bc492df15a..d1918657c8 100644
--- a/src/southbridge/intel/i82371eb/isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
@@ -23,8 +23,8 @@
#include <pc80/mc146818rtc.h>
#include <arch/ioapic.h>
#if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#endif
#include "i82371eb.h"
#include "chip.h"
diff --git a/src/southbridge/intel/i82371eb/wakeup.c b/src/southbridge/intel/i82371eb/wakeup.c
index 253433368e..45f0182edf 100644
--- a/src/southbridge/intel/i82371eb/wakeup.c
+++ b/src/southbridge/intel/i82371eb/wakeup.c
@@ -14,7 +14,7 @@
*/
#include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <console/console.h>
#include "i82371eb.h"
diff --git a/src/southbridge/intel/i82801dx/i82801dx.h b/src/southbridge/intel/i82801dx/i82801dx.h
index 35a0bc249e..0b54fe7ec9 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.h
+++ b/src/southbridge/intel/i82801dx/i82801dx.h
@@ -12,7 +12,7 @@
#ifndef I82801DX_H
#define I82801DX_H
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#if !defined(__ASSEMBLER__)
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index c81dabe1bc..c437cc8620 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -5,7 +5,7 @@
#include <device/device.h>
#include <device/pci.h>
#include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <cpu/x86/cache.h>
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index e54f2bd80f..3e9493fdbc 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -12,9 +12,9 @@
#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 <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <arch/smp/mpspec.h>
#include <cbmem.h>
#include <string.h>
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 8765cc1584..072f60b106 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -12,9 +12,9 @@
#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 <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <cbmem.h>
#include <string.h>
#include "chip.h"
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index 30be71fedc..6cf0c52611 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -9,7 +9,7 @@
#include <console/console.h>
#include <arch/io.h>
#include <device/pci_ops.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/smm.h>
#include <cpu/x86/smi_deprecated.h>
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index 77a8f7772b..e2658b32f9 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -12,9 +12,9 @@
#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 <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <arch/smp/mpspec.h>
#include <cbmem.h>
#include <string.h>
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 4edf87e7c5..0b0a9f2d39 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -13,9 +13,9 @@
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <elog.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <cbmem.h>
#include <string.h>
#include <cpu/x86/smm.h>
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index c582048853..1b2e0162f6 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <arch/smp/mpspec.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c
index ea641ee5fc..bcdb17a9bb 100644
--- a/src/southbridge/intel/ibexpeak/me.c
+++ b/src/southbridge/intel/ibexpeak/me.c
@@ -9,7 +9,7 @@
* not used unless the console loglevel is high enough.
*/
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <console/console.h>
#include <device/device.h>
#include <device/mmio.h>
diff --git a/src/southbridge/intel/ibexpeak/pch.h b/src/southbridge/intel/ibexpeak/pch.h
index fc20660e65..7e8306cce3 100644
--- a/src/southbridge/intel/ibexpeak/pch.h
+++ b/src/southbridge/intel/ibexpeak/pch.h
@@ -4,7 +4,7 @@
#ifndef SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
#define SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
/* PCH types */
#define PCH_TYPE_CPT 0x1c /* CougarPoint */
diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c
index 48e2a29bc8..315fb65f17 100644
--- a/src/southbridge/intel/lynxpoint/acpi.c
+++ b/src/southbridge/intel/lynxpoint/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 <cbmem.h>
#include <types.h>
#include <string.h>
diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index d19250cf6b..85d89501eb 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -2,7 +2,7 @@
/* This file is part of the coreboot project. */
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index b5fb674a26..6db647c6bf 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -11,14 +11,14 @@
#include <pc80/i8259.h>
#include <arch/io.h>
#include <arch/ioapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <cpu/x86/smm.h>
#include <cbmem.h>
#include <string.h>
#include "chip.h"
#include "nvs.h"
#include "pch.h"
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <southbridge/intel/common/acpi_pirq_gen.h>
#include <southbridge/intel/common/rtc.h>
#include <southbridge/intel/common/spi.h>
diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index 4599c26cff..2c2c6ea3c9 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.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/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index d583992ab9..8707349242 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -4,7 +4,7 @@
#ifndef SOUTHBRIDGE_INTEL_LYNXPOINT_PCH_H
#define SOUTHBRIDGE_INTEL_LYNXPOINT_PCH_H
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#define CROS_GPIO_DEVICE_NAME "LynxPoint"
diff --git a/src/superio/aspeed/ast2400/superio.c b/src/superio/aspeed/ast2400/superio.c
index a896b643c6..4b5d51dc2b 100644
--- a/src/superio/aspeed/ast2400/superio.c
+++ b/src/superio/aspeed/ast2400/superio.c
@@ -6,7 +6,7 @@
#include <superio/conf_mode.h>
#include <pc80/keyboard.h>
#include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include "ast2400.h"
#include "chip.h"
diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c
index 83cf074fe1..ca6b1bdf2c 100644
--- a/src/superio/common/conf_mode.c
+++ b/src/superio/common/conf_mode.c
@@ -4,7 +4,7 @@
#include <arch/io.h>
#include <device/device.h>
#include <superio/conf_mode.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
/* Common enter/exit implementations */
diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index cffe0c3476..d992830621 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -3,7 +3,7 @@
#include <device/device.h>
#include <device/pnp.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
#include <console/console.h>
static void generic_set_resources(struct device *dev)
diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c
index 9ff02fb3af..90d4461960 100644
--- a/src/superio/common/ssdt.c
+++ b/src/superio/common/ssdt.c
@@ -5,8 +5,8 @@
#include <device/device.h>
#include <device/pnp.h>
-#include <arch/acpigen.h>
-#include <arch/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpi.h>
#include <device/pnp_def.h>
#include <console/console.h>
#include <types.h>
diff --git a/src/superio/nuvoton/nct5539d/superio.c b/src/superio/nuvoton/nct5539d/superio.c
index 9a620c97ee..95e2e27836 100644
--- a/src/superio/nuvoton/nct5539d/superio.c
+++ b/src/superio/nuvoton/nct5539d/superio.c
@@ -9,7 +9,7 @@
#if CONFIG(HAVE_ACPI_TABLES)
#include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
static void nct5539d_init(struct device *dev)
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index fe1da65db2..4f83d1029f 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -6,7 +6,7 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <option.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <superio/conf_mode.h>
#include "nct5572d.h"
diff --git a/src/superio/nuvoton/nct6791d/superio.c b/src/superio/nuvoton/nct6791d/superio.c
index e04a9232ae..7d4e90cc74 100644
--- a/src/superio/nuvoton/nct6791d/superio.c
+++ b/src/superio/nuvoton/nct6791d/superio.c
@@ -6,7 +6,7 @@
#include <pc80/keyboard.h>
#include <superio/conf_mode.h>
#include <superio/common/ssdt.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include "nct6791d.h"
static void nct6791d_init(struct device *dev)
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index 8f5975ba26..6feee5e9da 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -8,8 +8,8 @@
#include <option.h>
#include <pc80/keyboard.h>
#include <superio/conf_mode.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
#include <superio/common/ssdt.h>
#include <stdlib.h>
diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c
index 685062170d..54f88551e4 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -6,7 +6,7 @@
#include <device/pnp.h>
#include <pc80/keyboard.h>
#include <option.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <superio/conf_mode.h>
#include "w83667hg-a.h"
diff --git a/src/vendorcode/eltan/security/mboot/mboot.h b/src/vendorcode/eltan/security/mboot/mboot.h
index 807bc05b41..1cc5dec404 100644
--- a/src/vendorcode/eltan/security/mboot/mboot.h
+++ b/src/vendorcode/eltan/security/mboot/mboot.h
@@ -5,7 +5,7 @@
#define MBOOT_H
#include <arch/io.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#include <string.h>
#include <console/console.h>
#include <cbfs.h>
diff --git a/src/vendorcode/google/chromeos/acpi.c b/src/vendorcode/google/chromeos/acpi.c
index abd5b67095..89bca785ab 100644
--- a/src/vendorcode/google/chromeos/acpi.c
+++ b/src/vendorcode/google/chromeos/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>
#if CONFIG(GENERIC_GPIO_LIB)
#include <gpio.h>
#endif
diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c
index 9562e7970b..297df1ee4a 100644
--- a/src/vendorcode/google/chromeos/elog.c
+++ b/src/vendorcode/google/chromeos/elog.c
@@ -7,7 +7,7 @@
#include <security/vboot/vboot_common.h>
#if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
#endif
static void elog_add_boot_reason(void *unused)