diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-11-28 13:53:15 +0100 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2018-11-30 22:02:35 +0000 |
| commit | aaced4a932dc68268cebace63df079673960c17b (patch) | |
| tree | bf948f7b699b3d954ea65d95a60cf901d8f75d9e /src | |
| parent | cf9fc1ddfebffc76eaf86aae9ae8afbe9ab5925d (diff) | |
cpu/intel/common: Use a common acpi/cpu.asl file
Change-Id: Ifa5a3a22771ff2e0efa14fb765603fd5e0440d59
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/29894
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: David Guckian
Diffstat (limited to 'src')
93 files changed, 81 insertions, 473 deletions
diff --git a/src/cpu/intel/fsp_model_406dx/acpi/cpu.asl b/src/cpu/intel/common/acpi/cpu.asl index 6fad17f74e..6fad17f74e 100644 --- a/src/cpu/intel/fsp_model_406dx/acpi/cpu.asl +++ b/src/cpu/intel/common/acpi/cpu.asl diff --git a/src/cpu/intel/haswell/acpi/cpu.asl b/src/cpu/intel/haswell/acpi/cpu.asl deleted file mode 100644 index 6fad17f74e..0000000000 --- a/src/cpu/intel/haswell/acpi/cpu.asl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/cpu/intel/model_206ax/acpi/cpu.asl b/src/cpu/intel/model_206ax/acpi/cpu.asl deleted file mode 100644 index 6fad17f74e..0000000000 --- a/src/cpu/intel/model_206ax/acpi/cpu.asl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/mainboard/adi/rcc-dff/dsdt.asl b/src/mainboard/adi/rcc-dff/dsdt.asl index 8091a4e6c2..310ad04741 100644 --- a/src/mainboard/adi/rcc-dff/dsdt.asl +++ b/src/mainboard/adi/rcc-dff/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( #include "acpi/thermal.asl" - #include <cpu/intel/fsp_model_406dx/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/apple/macbookair4_2/dsdt.asl b/src/mainboard/apple/macbookair4_2/dsdt.asl index 10baddb074..65ce63ea6e 100644 --- a/src/mainboard/apple/macbookair4_2/dsdt.asl +++ b/src/mainboard/apple/macbookair4_2/dsdt.asl @@ -26,7 +26,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/asrock/b75pro3-m/dsdt.asl b/src/mainboard/asrock/b75pro3-m/dsdt.asl index 5c86e77673..467a001dac 100644 --- a/src/mainboard/asrock/b75pro3-m/dsdt.asl +++ b/src/mainboard/asrock/b75pro3-m/dsdt.asl @@ -29,7 +29,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/asrock/h81m-hds/dsdt.asl b/src/mainboard/asrock/h81m-hds/dsdt.asl index 917b2e4ce5..f76c393bb0 100644 --- a/src/mainboard/asrock/h81m-hds/dsdt.asl +++ b/src/mainboard/asrock/h81m-hds/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( #include <southbridge/intel/lynxpoint/acpi/platform.asl> #include <southbridge/intel/lynxpoint/acpi/globalnvs.asl> #include <southbridge/intel/lynxpoint/acpi/sleepstates.asl> - #include <cpu/intel/haswell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl index aef4be6569..e3abc26303 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl +++ b/src/mainboard/asus/maximus_iv_gene-z/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock( ) { #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> diff --git a/src/mainboard/asus/p8h61-m_lx/dsdt.asl b/src/mainboard/asus/p8h61-m_lx/dsdt.asl index aef4be6569..e3abc26303 100644 --- a/src/mainboard/asus/p8h61-m_lx/dsdt.asl +++ b/src/mainboard/asus/p8h61-m_lx/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock( ) { #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> diff --git a/src/mainboard/asus/p8h61-m_pro/dsdt.asl b/src/mainboard/asus/p8h61-m_pro/dsdt.asl index 6714eb7b2a..d9861ef607 100644 --- a/src/mainboard/asus/p8h61-m_pro/dsdt.asl +++ b/src/mainboard/asus/p8h61-m_pro/dsdt.asl @@ -27,7 +27,7 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" #include "acpi/superio.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ diff --git a/src/mainboard/compulab/intense_pc/dsdt.asl b/src/mainboard/compulab/intense_pc/dsdt.asl index 41ff6e65ab..ad0940c275 100644 --- a/src/mainboard/compulab/intense_pc/dsdt.asl +++ b/src/mainboard/compulab/intense_pc/dsdt.asl @@ -29,7 +29,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/esd/atom15/dsdt.asl b/src/mainboard/esd/atom15/dsdt.asl index 2dc713992d..3719154bdd 100644 --- a/src/mainboard/esd/atom15/dsdt.asl +++ b/src/mainboard/esd/atom15/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/fsp_baytrail/acpi/globalnvs.asl> - #include <soc/intel/fsp_baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl index 51e1ed07ae..67054cc28d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3h/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl index 51e1ed07ae..67054cc28d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl +++ b/src/mainboard/gigabyte/ga-b75m-d3v/dsdt.asl @@ -25,7 +25,7 @@ DefinitionBlock( // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl index fc69222671..6a929d073e 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl @@ -29,7 +29,7 @@ DefinitionBlock( #include "acpi/platform.asl" #include "acpi/superio.asl" #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl index 3534c4e4d2..7a2aad9a4b 100644 --- a/src/mainboard/google/auron/dsdt.asl +++ b/src/mainboard/google/auron/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( //#include "acpi/gpe.asl" // CPU - #include <soc/intel/broadwell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl index 40f58e759b..41f908fcf7 100644 --- a/src/mainboard/google/beltino/dsdt.asl +++ b/src/mainboard/google/beltino/dsdt.asl @@ -34,7 +34,7 @@ DefinitionBlock( #include <southbridge/intel/lynxpoint/acpi/globalnvs.asl> // CPU - #include <cpu/intel/haswell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl index 8aced6ea2b..dd18e95ae6 100644 --- a/src/mainboard/google/butterfly/dsdt.asl +++ b/src/mainboard/google/butterfly/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl index 735a70eeb9..13b83b7f65 100644 --- a/src/mainboard/google/cyan/dsdt.asl +++ b/src/mainboard/google/cyan/dsdt.asl @@ -31,7 +31,7 @@ DefinitionBlock( /* global NVS and variables */ #include <acpi/globalnvs.asl> - #include <acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/dragonegg/dsdt.asl b/src/mainboard/google/dragonegg/dsdt.asl index 0d08cf7647..2e9ce6382d 100644 --- a/src/mainboard/google/dragonegg/dsdt.asl +++ b/src/mainboard/google/dragonegg/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <soc/intel/icelake/acpi/globalnvs.asl> // CPU - #include <soc/intel/icelake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index 718ef4759b..a705457826 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl index 50e3791d8d..03df2b9c8b 100644 --- a/src/mainboard/google/fizz/dsdt.asl +++ b/src/mainboard/google/fizz/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl index c1e3616331..af5f99d815 100644 --- a/src/mainboard/google/glados/dsdt.asl +++ b/src/mainboard/google/glados/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> // CPU - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index db09dc0231..e216b132a9 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( //#include "acpi/gpe.asl" // CPU - #include <soc/intel/broadwell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl index 5d7a28c1cb..ce4ba9195b 100644 --- a/src/mainboard/google/link/dsdt.asl +++ b/src/mainboard/google/link/dsdt.asl @@ -40,7 +40,7 @@ DefinitionBlock( //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl index 88be0a4a2d..b43494821a 100644 --- a/src/mainboard/google/octopus/dsdt.asl +++ b/src/mainboard/google/octopus/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl index 1d4a4aeec6..e866e21169 100644 --- a/src/mainboard/google/parrot/dsdt.asl +++ b/src/mainboard/google/parrot/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index 9d14298830..0001867988 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl index 5b5ea2ec36..8ca9dfb592 100644 --- a/src/mainboard/google/rambi/dsdt.asl +++ b/src/mainboard/google/rambi/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/baytrail/acpi/globalnvs.asl> - #include <soc/intel/baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl index 7ee16ee272..2b2f522661 100644 --- a/src/mainboard/google/reef/dsdt.asl +++ b/src/mainboard/google/reef/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl index 91ba815263..bed06fe2fd 100644 --- a/src/mainboard/google/sarien/dsdt.asl +++ b/src/mainboard/google/sarien/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/cannonlake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/cannonlake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PWRB) diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl index dcd74d8869..8424c258ae 100644 --- a/src/mainboard/google/slippy/dsdt.asl +++ b/src/mainboard/google/slippy/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( //#include "acpi/gpe.asl" // CPU - #include <cpu/intel/haswell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl index c9f5668310..1361a516de 100644 --- a/src/mainboard/google/stout/dsdt.asl +++ b/src/mainboard/google/stout/dsdt.asl @@ -40,7 +40,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/google/zoombini/dsdt.asl b/src/mainboard/google/zoombini/dsdt.asl index 040cafc769..e9988f097e 100644 --- a/src/mainboard/google/zoombini/dsdt.asl +++ b/src/mainboard/google/zoombini/dsdt.asl @@ -35,7 +35,7 @@ DefinitionBlock( #include <soc/intel/cannonlake/acpi/globalnvs.asl> // CPU - #include <soc/intel/cannonlake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/hp/2570p/dsdt.asl b/src/mainboard/hp/2570p/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/2570p/dsdt.asl +++ b/src/mainboard/hp/2570p/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/2760p/dsdt.asl b/src/mainboard/hp/2760p/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/2760p/dsdt.asl +++ b/src/mainboard/hp/2760p/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/8460p/dsdt.asl b/src/mainboard/hp/8460p/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/8460p/dsdt.asl +++ b/src/mainboard/hp/8460p/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/8470p/dsdt.asl b/src/mainboard/hp/8470p/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/8470p/dsdt.asl +++ b/src/mainboard/hp/8470p/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/8770w/dsdt.asl b/src/mainboard/hp/8770w/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/8770w/dsdt.asl +++ b/src/mainboard/hp/8770w/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl index 305149d95f..ef67ee7477 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl +++ b/src/mainboard/hp/compaq_8200_elite_sff/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/folio_9470m/dsdt.asl b/src/mainboard/hp/folio_9470m/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/folio_9470m/dsdt.asl +++ b/src/mainboard/hp/folio_9470m/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/hp/revolve_810_g1/dsdt.asl b/src/mainboard/hp/revolve_810_g1/dsdt.asl index aa3050d29b..756516efe2 100644 --- a/src/mainboard/hp/revolve_810_g1/dsdt.asl +++ b/src/mainboard/hp/revolve_810_g1/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl index 128bff61ea..c713330f38 100644 --- a/src/mainboard/intel/baskingridge/dsdt.asl +++ b/src/mainboard/intel/baskingridge/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( #include "acpi/thermal.asl" - #include <cpu/intel/haswell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/bayleybay_fsp/dsdt.asl b/src/mainboard/intel/bayleybay_fsp/dsdt.asl index 2dc713992d..3719154bdd 100644 --- a/src/mainboard/intel/bayleybay_fsp/dsdt.asl +++ b/src/mainboard/intel/bayleybay_fsp/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/fsp_baytrail/acpi/globalnvs.asl> - #include <soc/intel/fsp_baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/dcp847ske/dsdt.asl b/src/mainboard/intel/dcp847ske/dsdt.asl index d9d862cb9f..60f4c74241 100644 --- a/src/mainboard/intel/dcp847ske/dsdt.asl +++ b/src/mainboard/intel/dcp847ske/dsdt.asl @@ -26,7 +26,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl index 5965acb1fd..45968fbfc3 100644 --- a/src/mainboard/intel/emeraldlake2/dsdt.asl +++ b/src/mainboard/intel/emeraldlake2/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl index 0adc9a020f..759d669f8a 100644 --- a/src/mainboard/intel/glkrvp/dsdt.asl +++ b/src/mainboard/intel/glkrvp/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/harcuvar/dsdt.asl b/src/mainboard/intel/harcuvar/dsdt.asl index d979e9b4bd..9bc42cf4de 100644 --- a/src/mainboard/intel/harcuvar/dsdt.asl +++ b/src/mainboard/intel/harcuvar/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/denverton_ns/acpi/globalnvs.asl> - #include <soc/intel/denverton_ns/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl index c15f80c6a0..53feeb9e96 100644 --- a/src/mainboard/intel/icelake_rvp/dsdt.asl +++ b/src/mainboard/intel/icelake_rvp/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <soc/intel/icelake/acpi/globalnvs.asl> // CPU - #include <soc/intel/icelake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl index 4ddc92a2ea..ddb69da97d 100644 --- a/src/mainboard/intel/kblrvp/dsdt.asl +++ b/src/mainboard/intel/kblrvp/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> // CPU - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl index c1e3616331..af5f99d815 100644 --- a/src/mainboard/intel/kunimitsu/dsdt.asl +++ b/src/mainboard/intel/kunimitsu/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> // CPU - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/leafhill/dsdt.asl b/src/mainboard/intel/leafhill/dsdt.asl index 3be22feb55..48b24b9190 100644 --- a/src/mainboard/intel/leafhill/dsdt.asl +++ b/src/mainboard/intel/leafhill/dsdt.asl @@ -27,7 +27,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/littleplains/dsdt.asl b/src/mainboard/intel/littleplains/dsdt.asl index 8091a4e6c2..310ad04741 100644 --- a/src/mainboard/intel/littleplains/dsdt.asl +++ b/src/mainboard/intel/littleplains/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( #include "acpi/thermal.asl" - #include <cpu/intel/fsp_model_406dx/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/minnow3/dsdt.asl b/src/mainboard/intel/minnow3/dsdt.asl index 3be22feb55..48b24b9190 100644 --- a/src/mainboard/intel/minnow3/dsdt.asl +++ b/src/mainboard/intel/minnow3/dsdt.asl @@ -27,7 +27,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/minnowmax/dsdt.asl b/src/mainboard/intel/minnowmax/dsdt.asl index 2dc713992d..3719154bdd 100644 --- a/src/mainboard/intel/minnowmax/dsdt.asl +++ b/src/mainboard/intel/minnowmax/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/fsp_baytrail/acpi/globalnvs.asl> - #include <soc/intel/fsp_baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/mohonpeak/dsdt.asl b/src/mainboard/intel/mohonpeak/dsdt.asl index 8091a4e6c2..310ad04741 100644 --- a/src/mainboard/intel/mohonpeak/dsdt.asl +++ b/src/mainboard/intel/mohonpeak/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( #include "acpi/thermal.asl" - #include <cpu/intel/fsp_model_406dx/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl index 2cb8e72d56..ac929a6bc4 100644 --- a/src/mainboard/intel/saddlebrook/dsdt.asl +++ b/src/mainboard/intel/saddlebrook/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> // CPU - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl index 9380b393a8..c8be3cea17 100644 --- a/src/mainboard/intel/strago/dsdt.asl +++ b/src/mainboard/intel/strago/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( /* global NVS and variables */ #include <acpi/globalnvs.asl> - #include <acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl index 48ea66b044..42fd7eab95 100644 --- a/src/mainboard/intel/wtm2/dsdt.asl +++ b/src/mainboard/intel/wtm2/dsdt.asl @@ -36,7 +36,7 @@ DefinitionBlock( //#include "acpi/gpe.asl" // CPU - #include <soc/intel/broadwell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl index 85ba20bdaa..f0dd7eee2c 100644 --- a/src/mainboard/kontron/ktqm77/dsdt.asl +++ b/src/mainboard/kontron/ktqm77/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/l520/dsdt.asl b/src/mainboard/lenovo/l520/dsdt.asl index b058657bf0..a04f8529a6 100644 --- a/src/mainboard/lenovo/l520/dsdt.asl +++ b/src/mainboard/lenovo/l520/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/lenovo/s230u/dsdt.asl b/src/mainboard/lenovo/s230u/dsdt.asl index aeac7c7567..0b994c86da 100644 --- a/src/mainboard/lenovo/s230u/dsdt.asl +++ b/src/mainboard/lenovo/s230u/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { #include "acpi/platform.asl" #include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> #include <southbridge/intel/bd82x6x/acpi/sleepstates.asl> diff --git a/src/mainboard/lenovo/t420/dsdt.asl b/src/mainboard/lenovo/t420/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/t420/dsdt.asl +++ b/src/mainboard/lenovo/t420/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/t420s/dsdt.asl +++ b/src/mainboard/lenovo/t420s/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/t430/dsdt.asl b/src/mainboard/lenovo/t430/dsdt.asl index 3995ee3198..3cdebe9a4f 100644 --- a/src/mainboard/lenovo/t430/dsdt.asl +++ b/src/mainboard/lenovo/t430/dsdt.asl @@ -27,7 +27,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/t430s/dsdt.asl +++ b/src/mainboard/lenovo/t430s/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/t520/dsdt.asl +++ b/src/mainboard/lenovo/t520/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/t530/dsdt.asl +++ b/src/mainboard/lenovo/t530/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/x131e/dsdt.asl b/src/mainboard/lenovo/x131e/dsdt.asl index 93495bb286..d128c0d49b 100644 --- a/src/mainboard/lenovo/x131e/dsdt.asl +++ b/src/mainboard/lenovo/x131e/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> // global NVS and variables diff --git a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl index c40669763f..8c9bd5ad64 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl +++ b/src/mainboard/lenovo/x1_carbon_gen1/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl index 8b2fb78b95..650a315221 100644 --- a/src/mainboard/lenovo/x201/dsdt.asl +++ b/src/mainboard/lenovo/x201/dsdt.asl @@ -40,7 +40,7 @@ DefinitionBlock( /* General Purpose Events */ #include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/x220/dsdt.asl +++ b/src/mainboard/lenovo/x220/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl index ba96303e6e..1cb4add847 100644 --- a/src/mainboard/lenovo/x230/dsdt.asl +++ b/src/mainboard/lenovo/x230/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/opencellular/rotundu/dsdt.asl b/src/mainboard/opencellular/rotundu/dsdt.asl index 2dc713992d..3719154bdd 100644 --- a/src/mainboard/opencellular/rotundu/dsdt.asl +++ b/src/mainboard/opencellular/rotundu/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/fsp_baytrail/acpi/globalnvs.asl> - #include <soc/intel/fsp_baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl index ebe2917f7b..92994c0601 100644 --- a/src/mainboard/packardbell/ms2290/dsdt.asl +++ b/src/mainboard/packardbell/ms2290/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( /* General Purpose Events */ #include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/purism/librem_bdw/dsdt.asl b/src/mainboard/purism/librem_bdw/dsdt.asl index 405a6b76f5..bd49349cde 100644 --- a/src/mainboard/purism/librem_bdw/dsdt.asl +++ b/src/mainboard/purism/librem_bdw/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( #include <soc/intel/broadwell/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/broadwell/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/purism/librem_skl/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl index a2397a6bf7..1bf202ea47 100644 --- a/src/mainboard/purism/librem_skl/dsdt.asl +++ b/src/mainboard/purism/librem_skl/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <soc/intel/skylake/acpi/globalnvs.asl> // CPU - #include <soc/intel/skylake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/roda/rv11/dsdt.asl b/src/mainboard/roda/rv11/dsdt.asl index 4859e6b43e..859b4cd157 100644 --- a/src/mainboard/roda/rv11/dsdt.asl +++ b/src/mainboard/roda/rv11/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( #include "acpi/alsd.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl index d9de5617f3..c007432581 100644 --- a/src/mainboard/samsung/lumpy/dsdt.asl +++ b/src/mainboard/samsung/lumpy/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // General Purpose Events //#include "acpi/gpe.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl index ef5a273f68..969ef66701 100644 --- a/src/mainboard/samsung/stumpy/dsdt.asl +++ b/src/mainboard/samsung/stumpy/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( #include "acpi/thermal.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl index dcec95fcbd..60ba44b6aa 100644 --- a/src/mainboard/sapphire/pureplatinumh61/dsdt.asl +++ b/src/mainboard/sapphire/pureplatinumh61/dsdt.asl @@ -29,7 +29,7 @@ DefinitionBlock( { // Some generic macros #include "acpi/platform.asl" - #include <cpu/intel/model_206ax/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> #include <southbridge/intel/bd82x6x/acpi/platform.asl> /* global NVS and variables. */ #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> diff --git a/src/mainboard/scaleway/tagada/dsdt.asl b/src/mainboard/scaleway/tagada/dsdt.asl index d979e9b4bd..9bc42cf4de 100644 --- a/src/mainboard/scaleway/tagada/dsdt.asl +++ b/src/mainboard/scaleway/tagada/dsdt.asl @@ -39,7 +39,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/denverton_ns/acpi/globalnvs.asl> - #include <soc/intel/denverton_ns/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/siemens/mc_apl1/dsdt.asl b/src/mainboard/siemens/mc_apl1/dsdt.asl index 0eaadb43ad..9ce3ef8bc1 100644 --- a/src/mainboard/siemens/mc_apl1/dsdt.asl +++ b/src/mainboard/siemens/mc_apl1/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( #include <soc/intel/apollolake/acpi/globalnvs.asl> /* CPU */ - #include <soc/intel/apollolake/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/mainboard/siemens/mc_tcu3/dsdt.asl b/src/mainboard/siemens/mc_tcu3/dsdt.asl index 2dc713992d..3719154bdd 100644 --- a/src/mainboard/siemens/mc_tcu3/dsdt.asl +++ b/src/mainboard/siemens/mc_tcu3/dsdt.asl @@ -38,7 +38,7 @@ DefinitionBlock( // global NVS and variables #include <soc/intel/fsp_baytrail/acpi/globalnvs.asl> - #include <soc/intel/fsp_baytrail/acpi/cpu.asl> + #include <cpu/intel/common/acpi/cpu.asl> Scope (\_SB) { Device (PCI0) diff --git a/src/soc/intel/apollolake/acpi/cpu.asl b/src/soc/intel/apollolake/acpi/cpu.asl deleted file mode 100644 index d42d1bbe51..0000000000 --- a/src/soc/intel/apollolake/acpi/cpu.asl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/baytrail/acpi/cpu.asl b/src/soc/intel/baytrail/acpi/cpu.asl deleted file mode 100644 index 5c153f4a59..0000000000 --- a/src/soc/intel/baytrail/acpi/cpu.asl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/braswell/acpi/cpu.asl b/src/soc/intel/braswell/acpi/cpu.asl deleted file mode 100644 index 5c153f4a59..0000000000 --- a/src/soc/intel/braswell/acpi/cpu.asl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/broadwell/acpi/cpu.asl b/src/soc/intel/broadwell/acpi/cpu.asl deleted file mode 100644 index d42d1bbe51..0000000000 --- a/src/soc/intel/broadwell/acpi/cpu.asl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/cannonlake/acpi/cpu.asl b/src/soc/intel/cannonlake/acpi/cpu.asl deleted file mode 100644 index 5f65bd8b4b..0000000000 --- a/src/soc/intel/cannonlake/acpi/cpu.asl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/denverton_ns/acpi/cpu.asl b/src/soc/intel/denverton_ns/acpi/cpu.asl deleted file mode 100644 index 673df943ff..0000000000 --- a/src/soc/intel/denverton_ns/acpi/cpu.asl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * Copyright (C) 2014 - 2017 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/fsp_baytrail/acpi/cpu.asl b/src/soc/intel/fsp_baytrail/acpi/cpu.asl deleted file mode 100644 index 5c153f4a59..0000000000 --- a/src/soc/intel/fsp_baytrail/acpi/cpu.asl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/icelake/acpi/cpu.asl b/src/soc/intel/icelake/acpi/cpu.asl deleted file mode 100644 index 2981c19754..0000000000 --- a/src/soc/intel/icelake/acpi/cpu.asl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2018 Intel Corp. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} diff --git a/src/soc/intel/skylake/acpi/cpu.asl b/src/soc/intel/skylake/acpi/cpu.asl deleted file mode 100644 index d42d1bbe51..0000000000 --- a/src/soc/intel/skylake/acpi/cpu.asl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* These come from the dynamically created CPU SSDT */ -External (\_PR.CNOT, MethodObj) - -/* Notify OS to re-read CPU tables */ -Method (PNOT) -{ - \_PR.CNOT (0x81) -} - -/* Notify OS to re-read CPU _PPC limit */ -Method (PPCN) -{ - \_PR.CNOT (0x80) -} - -/* Notify OS to re-read Throttle Limit tables */ -Method (TNOT) -{ - \_PR.CNOT (0x82) -} |