aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-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
408 files changed, 409 insertions, 409 deletions
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",