From ade4f3520b0c2bade062286ec98b40b49b6534d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 20 Jan 2021 23:02:16 +0200 Subject: ACPI: Move include for MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4356a8bda71e84afe8c348d366479c5006bf2459 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/49796 Reviewed-by: Tim Wawrzynczak Tested-by: build bot (Jenkins) --- src/acpi/dsdt_top.asl | 2 ++ src/mainboard/google/auron/dsdt.asl | 3 --- src/mainboard/google/beltino/dsdt.asl | 3 --- src/mainboard/google/brya/dsdt.asl | 3 --- src/mainboard/google/butterfly/dsdt.asl | 2 -- src/mainboard/google/cyan/dsdt.asl | 2 -- src/mainboard/google/dedede/dsdt.asl | 3 --- src/mainboard/google/deltaur/dsdt.asl | 3 --- src/mainboard/google/drallion/dsdt.asl | 2 -- src/mainboard/google/eve/dsdt.asl | 3 --- src/mainboard/google/fizz/dsdt.asl | 3 --- src/mainboard/google/glados/dsdt.asl | 3 --- src/mainboard/google/hatch/dsdt.asl | 5 ----- src/mainboard/google/jecht/dsdt.asl | 3 --- src/mainboard/google/kahlee/dsdt.asl | 3 --- src/mainboard/google/link/dsdt.asl | 2 -- src/mainboard/google/octopus/dsdt.asl | 3 --- src/mainboard/google/parrot/dsdt.asl | 2 -- src/mainboard/google/poppy/dsdt.asl | 3 --- src/mainboard/google/rambi/dsdt.asl | 2 -- src/mainboard/google/reef/dsdt.asl | 3 --- src/mainboard/google/sarien/dsdt.asl | 2 -- src/mainboard/google/slippy/dsdt.asl | 3 --- src/mainboard/google/stout/dsdt.asl | 2 -- src/mainboard/google/volteer/dsdt.asl | 3 --- src/mainboard/google/zork/dsdt.asl | 3 --- src/mainboard/intel/adlrvp/dsdt.asl | 5 ----- src/mainboard/intel/baskingridge/dsdt.asl | 2 -- src/mainboard/intel/coffeelake_rvp/dsdt.asl | 5 ----- src/mainboard/intel/emeraldlake2/dsdt.asl | 2 -- src/mainboard/intel/glkrvp/dsdt.asl | 3 --- src/mainboard/intel/icelake_rvp/dsdt.asl | 5 ----- src/mainboard/intel/jasperlake_rvp/dsdt.asl | 5 ----- src/mainboard/intel/kblrvp/dsdt.asl | 5 ----- src/mainboard/intel/kunimitsu/dsdt.asl | 3 --- src/mainboard/intel/strago/dsdt.asl | 2 -- src/mainboard/intel/tglrvp/dsdt.asl | 5 ----- src/mainboard/intel/wtm2/dsdt.asl | 3 --- src/mainboard/samsung/lumpy/dsdt.asl | 2 -- src/mainboard/samsung/stumpy/dsdt.asl | 2 -- 40 files changed, 2 insertions(+), 118 deletions(-) diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl index 8dceb6ae27..d2fcfa6264 100644 --- a/src/acpi/dsdt_top.asl +++ b/src/acpi/dsdt_top.asl @@ -3,5 +3,7 @@ #include #if CONFIG(CHROMEOS) +/* Chrome OS specific */ #include +#include #endif diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl index 747134f292..3d6d0ff0ac 100644 --- a/src/mainboard/google/auron/dsdt.asl +++ b/src/mainboard/google/auron/dsdt.asl @@ -31,9 +31,6 @@ DefinitionBlock( } } - // Chrome OS specific - #include - #include // Mainboard specific diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl index 2156acff33..bbb3002a76 100644 --- a/src/mainboard/google/beltino/dsdt.asl +++ b/src/mainboard/google/beltino/dsdt.asl @@ -33,8 +33,5 @@ DefinitionBlock( // Mainboard devices #include "acpi/mainboard.asl" - // Chrome OS specific - #include - #include } diff --git a/src/mainboard/google/brya/dsdt.asl b/src/mainboard/google/brya/dsdt.asl index ea0bbf6c7b..3b50507fe6 100644 --- a/src/mainboard/google/brya/dsdt.asl +++ b/src/mainboard/google/brya/dsdt.asl @@ -33,9 +33,6 @@ DefinitionBlock( /* Chipset specific sleep states */ #include - /* Chrome OS specific */ - #include - /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl index d3800096b7..81e30748ef 100644 --- a/src/mainboard/google/butterfly/dsdt.asl +++ b/src/mainboard/google/butterfly/dsdt.asl @@ -34,7 +34,5 @@ DefinitionBlock( } } - #include - #include } diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl index 2652076241..8c363ad257 100644 --- a/src/mainboard/google/cyan/dsdt.asl +++ b/src/mainboard/google/cyan/dsdt.asl @@ -45,8 +45,6 @@ DefinitionBlock( #include } } - #include - #include #include "acpi/mainboard.asl" diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index c437ecf509..f88e2df55d 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -35,9 +35,6 @@ DefinitionBlock( #include #endif - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/deltaur/dsdt.asl b/src/mainboard/google/deltaur/dsdt.asl index b8d4c8a440..47758d4df1 100644 --- a/src/mainboard/google/deltaur/dsdt.asl +++ b/src/mainboard/google/deltaur/dsdt.asl @@ -30,9 +30,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - /* VPD support */ #include diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl index 8d571bb1c5..2de104e543 100644 --- a/src/mainboard/google/drallion/dsdt.asl +++ b/src/mainboard/google/drallion/dsdt.asl @@ -32,8 +32,6 @@ DefinitionBlock( } #if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include /* VPD support */ #include #endif diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index a5f7d5f15a..2b0dd85a88 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -32,9 +32,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl index bbc37ac418..4ca771e09e 100644 --- a/src/mainboard/google/fizz/dsdt.asl +++ b/src/mainboard/google/fizz/dsdt.asl @@ -31,9 +31,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl index 4b78de03a6..4d90e286e2 100644 --- a/src/mainboard/google/glados/dsdt.asl +++ b/src/mainboard/google/glados/dsdt.asl @@ -31,9 +31,6 @@ DefinitionBlock( #include "acpi/dptf.asl" } - // Chrome OS specific - #include - #include // Mainboard specific diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl index b667e7e4e3..022a607a1d 100644 --- a/src/mainboard/google/hatch/dsdt.asl +++ b/src/mainboard/google/hatch/dsdt.asl @@ -33,11 +33,6 @@ DefinitionBlock( } } -#if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include -#endif - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl index 88d312a463..220caee144 100644 --- a/src/mainboard/google/jecht/dsdt.asl +++ b/src/mainboard/google/jecht/dsdt.asl @@ -32,9 +32,6 @@ DefinitionBlock( } } - // Chrome OS specific - #include - #include // Mainboard specific diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index 44195ce1ea..d8b25e0ac9 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -52,9 +52,6 @@ DefinitionBlock ( /* Thermal handler */ #include - /* Chrome OS specific */ - #include - /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl index d3800096b7..81e30748ef 100644 --- a/src/mainboard/google/link/dsdt.asl +++ b/src/mainboard/google/link/dsdt.asl @@ -34,7 +34,5 @@ DefinitionBlock( } } - #include - #include } diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl index 629f806a1f..bebee41b15 100644 --- a/src/mainboard/google/octopus/dsdt.asl +++ b/src/mainboard/google/octopus/dsdt.asl @@ -30,9 +30,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl index fa39cac3fe..dbb3413434 100644 --- a/src/mainboard/google/parrot/dsdt.asl +++ b/src/mainboard/google/parrot/dsdt.asl @@ -35,7 +35,5 @@ DefinitionBlock( #include "acpi/mainboard.asl" - #include - #include } diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index bde32ccd52..cf4692e416 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -39,9 +39,6 @@ DefinitionBlock( #include #endif - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl index 3136571d4b..1db8c9285b 100644 --- a/src/mainboard/google/rambi/dsdt.asl +++ b/src/mainboard/google/rambi/dsdt.asl @@ -32,8 +32,6 @@ DefinitionBlock( #include "acpi/dptf.asl" } - #include - #include #include "acpi/mainboard.asl" diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl index 98cba0ca5a..fde3975521 100644 --- a/src/mainboard/google/reef/dsdt.asl +++ b/src/mainboard/google/reef/dsdt.asl @@ -30,9 +30,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl index e561af5c8d..027fa08f8a 100644 --- a/src/mainboard/google/sarien/dsdt.asl +++ b/src/mainboard/google/sarien/dsdt.asl @@ -32,8 +32,6 @@ DefinitionBlock( } #if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include /* VPD support */ #include #endif diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl index 972c3823e3..b82defce61 100644 --- a/src/mainboard/google/slippy/dsdt.asl +++ b/src/mainboard/google/slippy/dsdt.asl @@ -43,8 +43,5 @@ DefinitionBlock( // Mainboard specific #include "acpi/mainboard.asl" - // Chrome OS specific - #include - #include } diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl index fdb994e903..8e2d8590a6 100644 --- a/src/mainboard/google/stout/dsdt.asl +++ b/src/mainboard/google/stout/dsdt.asl @@ -35,7 +35,5 @@ DefinitionBlock( } } - #include - #include } diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl index 10064330f3..66747d17c2 100644 --- a/src/mainboard/google/volteer/dsdt.asl +++ b/src/mainboard/google/volteer/dsdt.asl @@ -36,9 +36,6 @@ DefinitionBlock( #include "mainboard.asl" } - // Chrome OS specific - #include - // Chrome OS Embedded Controller Scope (\_SB.PCI0.LPCB) { diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index 3ffbd2f3f7..ab8f145ec0 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -44,9 +44,6 @@ DefinitionBlock ( /* Thermal handler */ #include - /* Chrome OS specific */ - #include - /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { diff --git a/src/mainboard/intel/adlrvp/dsdt.asl b/src/mainboard/intel/adlrvp/dsdt.asl index cf73ddf62b..6a4f512f43 100644 --- a/src/mainboard/intel/adlrvp/dsdt.asl +++ b/src/mainboard/intel/adlrvp/dsdt.asl @@ -31,11 +31,6 @@ DefinitionBlock( /* Camera */ #include -#if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include -#endif - #if CONFIG(EC_GOOGLE_CHROMEEC) /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl index ac8f408709..29f8b78d54 100644 --- a/src/mainboard/intel/baskingridge/dsdt.asl +++ b/src/mainboard/intel/baskingridge/dsdt.asl @@ -32,7 +32,5 @@ DefinitionBlock( } } - #include - #include } diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl index 73b95e60e8..703b46aa39 100644 --- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl +++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl @@ -24,11 +24,6 @@ DefinitionBlock( } } -#if CONFIG(CHROMEOS) - // Chrome OS specific - #include -#endif - #include } diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl index 5942be8c62..13dba6a24f 100644 --- a/src/mainboard/intel/emeraldlake2/dsdt.asl +++ b/src/mainboard/intel/emeraldlake2/dsdt.asl @@ -33,7 +33,5 @@ DefinitionBlock( } } - #include - #include } diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl index fd8054e808..f4169da46d 100644 --- a/src/mainboard/intel/glkrvp/dsdt.asl +++ b/src/mainboard/intel/glkrvp/dsdt.asl @@ -29,9 +29,6 @@ DefinitionBlock( } } - /* Chrome OS specific */ - #include - #include /* Chrome OS Embedded Controller */ diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl index 376c9a5415..2097b3e39c 100644 --- a/src/mainboard/intel/icelake_rvp/dsdt.asl +++ b/src/mainboard/intel/icelake_rvp/dsdt.asl @@ -30,11 +30,6 @@ DefinitionBlock( } } -#if CONFIG(CHROMEOS) - // Chrome OS specific - #include -#endif - #if CONFIG(EC_GOOGLE_CHROMEEC) /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl index 15489572dc..cebd048256 100644 --- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl +++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl @@ -30,11 +30,6 @@ DefinitionBlock( } } -#if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include -#endif - #if CONFIG(EC_GOOGLE_CHROMEEC) /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl index 24f795f1bb..bfd51c504f 100644 --- a/src/mainboard/intel/kblrvp/dsdt.asl +++ b/src/mainboard/intel/kblrvp/dsdt.asl @@ -36,10 +36,5 @@ DefinitionBlock( #include "acpi/ipu_mainboard.asl" #include "acpi/mipi_camera.asl" -#if CONFIG(CHROMEOS) - // Chrome OS specific - #include -#endif - #include } diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl index 471f4d31e6..c307dd869b 100644 --- a/src/mainboard/intel/kunimitsu/dsdt.asl +++ b/src/mainboard/intel/kunimitsu/dsdt.asl @@ -30,8 +30,5 @@ DefinitionBlock( #include "acpi/dptf.asl" } - // Chrome OS specific - #include - #include } diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl index 05b5b2e74f..dfe9809c73 100644 --- a/src/mainboard/intel/strago/dsdt.asl +++ b/src/mainboard/intel/strago/dsdt.asl @@ -40,8 +40,6 @@ DefinitionBlock( #include } } - #include - #include #include "acpi/mainboard.asl" diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl index 1f45c36849..ca1e441d10 100644 --- a/src/mainboard/intel/tglrvp/dsdt.asl +++ b/src/mainboard/intel/tglrvp/dsdt.asl @@ -32,11 +32,6 @@ DefinitionBlock( } } -#if CONFIG(CHROMEOS) - /* Chrome OS specific */ - #include -#endif - #if CONFIG(EC_GOOGLE_CHROMEEC) /* Chrome OS Embedded Controller */ Scope (\_SB.PCI0.LPCB) diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl index dc479c1d4b..a968c2d881 100644 --- a/src/mainboard/intel/wtm2/dsdt.asl +++ b/src/mainboard/intel/wtm2/dsdt.asl @@ -35,9 +35,6 @@ DefinitionBlock( // Thermal handler #include "acpi/thermal.asl" - // Chrome OS specific - #include - #include // Mainboard specific diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl index cf7fe4741a..735ca98d84 100644 --- a/src/mainboard/samsung/lumpy/dsdt.asl +++ b/src/mainboard/samsung/lumpy/dsdt.asl @@ -36,7 +36,5 @@ DefinitionBlock( // mainboard specific devices #include "acpi/mainboard.asl" - #include - #include } diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl index 1202ca7bc3..816247bee6 100644 --- a/src/mainboard/samsung/stumpy/dsdt.asl +++ b/src/mainboard/samsung/stumpy/dsdt.asl @@ -31,7 +31,5 @@ DefinitionBlock( } } - #include - #include } -- cgit v1.2.3