ACPI: Move include for <vc/google/chromeos.asl>
Change-Id: I4356a8bda71e84afe8c348d366479c5006bf2459
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49796
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl
index 8dceb6a..d2fcfa6 100644
--- a/src/acpi/dsdt_top.asl
+++ b/src/acpi/dsdt_top.asl
@@ -3,5 +3,7 @@
#include <acpi/acpigen_extern.asl>
#if CONFIG(CHROMEOS)
+/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/gnvs.asl>
+#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl
index 747134f..3d6d0ff 100644
--- a/src/mainboard/google/auron/dsdt.asl
+++ b/src/mainboard/google/auron/dsdt.asl
@@ -31,9 +31,6 @@
}
}
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific
diff --git a/src/mainboard/google/beltino/dsdt.asl b/src/mainboard/google/beltino/dsdt.asl
index 2156acf..bbb3002 100644
--- a/src/mainboard/google/beltino/dsdt.asl
+++ b/src/mainboard/google/beltino/dsdt.asl
@@ -33,8 +33,5 @@
// Mainboard devices
#include "acpi/mainboard.asl"
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/brya/dsdt.asl b/src/mainboard/google/brya/dsdt.asl
index ea0bbf6..3b50507 100644
--- a/src/mainboard/google/brya/dsdt.asl
+++ b/src/mainboard/google/brya/dsdt.asl
@@ -33,9 +33,6 @@
/* Chipset specific sleep states */
#include <southbridge/intel/common/acpi/sleepstates.asl>
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
/* 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 d380009..81e3074 100644
--- a/src/mainboard/google/butterfly/dsdt.asl
+++ b/src/mainboard/google/butterfly/dsdt.asl
@@ -34,7 +34,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl
index 2652076..8c363ad 100644
--- a/src/mainboard/google/cyan/dsdt.asl
+++ b/src/mainboard/google/cyan/dsdt.asl
@@ -45,8 +45,6 @@
#include <soc/intel/common/acpi/wifi.asl>
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl"
diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl
index c437ecf..f88e2df 100644
--- a/src/mainboard/google/dedede/dsdt.asl
+++ b/src/mainboard/google/dedede/dsdt.asl
@@ -35,9 +35,6 @@
#include <variant/acpi/camera.asl>
#endif
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/deltaur/dsdt.asl b/src/mainboard/google/deltaur/dsdt.asl
index b8d4c8a..47758d4 100644
--- a/src/mainboard/google/deltaur/dsdt.asl
+++ b/src/mainboard/google/deltaur/dsdt.asl
@@ -30,9 +30,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
/* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl>
diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl
index 8d571bb..2de104e 100644
--- a/src/mainboard/google/drallion/dsdt.asl
+++ b/src/mainboard/google/drallion/dsdt.asl
@@ -32,8 +32,6 @@
}
#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl>
#endif
diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl
index a5f7d5f..2b0dd85 100644
--- a/src/mainboard/google/eve/dsdt.asl
+++ b/src/mainboard/google/eve/dsdt.asl
@@ -32,9 +32,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl
index bbc37ac..4ca771e 100644
--- a/src/mainboard/google/fizz/dsdt.asl
+++ b/src/mainboard/google/fizz/dsdt.asl
@@ -31,9 +31,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl
index 4b78de0..4d90e28 100644
--- a/src/mainboard/google/glados/dsdt.asl
+++ b/src/mainboard/google/glados/dsdt.asl
@@ -31,9 +31,6 @@
#include "acpi/dptf.asl"
}
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific
diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
index b667e7e..022a607 100644
--- a/src/mainboard/google/hatch/dsdt.asl
+++ b/src/mainboard/google/hatch/dsdt.asl
@@ -33,11 +33,6 @@
}
}
-#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#endif
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl
index 88d312a..220caee 100644
--- a/src/mainboard/google/jecht/dsdt.asl
+++ b/src/mainboard/google/jecht/dsdt.asl
@@ -32,9 +32,6 @@
}
}
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific
diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl
index 44195ce..d8b25e0 100644
--- a/src/mainboard/google/kahlee/dsdt.asl
+++ b/src/mainboard/google/kahlee/dsdt.asl
@@ -52,9 +52,6 @@
/* Thermal handler */
#include <variant/acpi/thermal.asl>
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
/* 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 d380009..81e3074 100644
--- a/src/mainboard/google/link/dsdt.asl
+++ b/src/mainboard/google/link/dsdt.asl
@@ -34,7 +34,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl
index 629f806..bebee41 100644
--- a/src/mainboard/google/octopus/dsdt.asl
+++ b/src/mainboard/google/octopus/dsdt.asl
@@ -30,9 +30,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl
index fa39cac3..dbb3413 100644
--- a/src/mainboard/google/parrot/dsdt.asl
+++ b/src/mainboard/google/parrot/dsdt.asl
@@ -35,7 +35,5 @@
#include "acpi/mainboard.asl"
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
index bde32cc..cf4692e 100644
--- a/src/mainboard/google/poppy/dsdt.asl
+++ b/src/mainboard/google/poppy/dsdt.asl
@@ -39,9 +39,6 @@
#include <variant/acpi/camera.asl>
#endif
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl
index 3136571..1db8c92 100644
--- a/src/mainboard/google/rambi/dsdt.asl
+++ b/src/mainboard/google/rambi/dsdt.asl
@@ -32,8 +32,6 @@
#include "acpi/dptf.asl"
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl"
diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl
index 98cba0c..fde3975 100644
--- a/src/mainboard/google/reef/dsdt.asl
+++ b/src/mainboard/google/reef/dsdt.asl
@@ -30,9 +30,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
index e561af5..027fa08 100644
--- a/src/mainboard/google/sarien/dsdt.asl
+++ b/src/mainboard/google/sarien/dsdt.asl
@@ -32,8 +32,6 @@
}
#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl>
#endif
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
index 972c382..b82defc 100644
--- a/src/mainboard/google/slippy/dsdt.asl
+++ b/src/mainboard/google/slippy/dsdt.asl
@@ -43,8 +43,5 @@
// Mainboard specific
#include "acpi/mainboard.asl"
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl
index fdb994e..8e2d859 100644
--- a/src/mainboard/google/stout/dsdt.asl
+++ b/src/mainboard/google/stout/dsdt.asl
@@ -35,7 +35,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index 1006433..66747d1 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -36,9 +36,6 @@
#include "mainboard.asl"
}
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
// 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 3ffbd2f..ab8f145 100644
--- a/src/mainboard/google/zork/dsdt.asl
+++ b/src/mainboard/google/zork/dsdt.asl
@@ -44,9 +44,6 @@
/* Thermal handler */
#include <variant/acpi/thermal.asl>
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
/* 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 cf73ddf..6a4f512 100644
--- a/src/mainboard/intel/adlrvp/dsdt.asl
+++ b/src/mainboard/intel/adlrvp/dsdt.asl
@@ -31,11 +31,6 @@
/* Camera */
#include <acpi/mipi_camera.asl>
-#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#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 ac8f408..29f8b78 100644
--- a/src/mainboard/intel/baskingridge/dsdt.asl
+++ b/src/mainboard/intel/baskingridge/dsdt.asl
@@ -32,7 +32,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/intel/coffeelake_rvp/dsdt.asl b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
index 73b95e6..703b46a 100644
--- a/src/mainboard/intel/coffeelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/coffeelake_rvp/dsdt.asl
@@ -24,11 +24,6 @@
}
}
-#if CONFIG(CHROMEOS)
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#endif
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
index 5942be8..13dba6a 100644
--- a/src/mainboard/intel/emeraldlake2/dsdt.asl
+++ b/src/mainboard/intel/emeraldlake2/dsdt.asl
@@ -33,7 +33,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl
index fd8054e..f4169da 100644
--- a/src/mainboard/intel/glkrvp/dsdt.asl
+++ b/src/mainboard/intel/glkrvp/dsdt.asl
@@ -29,9 +29,6 @@
}
}
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */
diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl
index 376c9a5..2097b3e 100644
--- a/src/mainboard/intel/icelake_rvp/dsdt.asl
+++ b/src/mainboard/intel/icelake_rvp/dsdt.asl
@@ -30,11 +30,6 @@
}
}
-#if CONFIG(CHROMEOS)
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#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 1548957..cebd048 100644
--- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl
+++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl
@@ -30,11 +30,6 @@
}
}
-#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#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 24f795f..bfd51c5 100644
--- a/src/mainboard/intel/kblrvp/dsdt.asl
+++ b/src/mainboard/intel/kblrvp/dsdt.asl
@@ -36,10 +36,5 @@
#include "acpi/ipu_mainboard.asl"
#include "acpi/mipi_camera.asl"
-#if CONFIG(CHROMEOS)
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#endif
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index 471f4d3..c307dd8 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -30,8 +30,5 @@
#include "acpi/dptf.asl"
}
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl
index 05b5b2e..dfe9809 100644
--- a/src/mainboard/intel/strago/dsdt.asl
+++ b/src/mainboard/intel/strago/dsdt.asl
@@ -40,8 +40,6 @@
#include <soc/intel/common/acpi/wifi.asl>
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl"
diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl
index 1f45c36..ca1e441 100644
--- a/src/mainboard/intel/tglrvp/dsdt.asl
+++ b/src/mainboard/intel/tglrvp/dsdt.asl
@@ -32,11 +32,6 @@
}
}
-#if CONFIG(CHROMEOS)
- /* Chrome OS specific */
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-#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 dc479c1..a968c2d 100644
--- a/src/mainboard/intel/wtm2/dsdt.asl
+++ b/src/mainboard/intel/wtm2/dsdt.asl
@@ -35,9 +35,6 @@
// Thermal handler
#include "acpi/thermal.asl"
- // Chrome OS specific
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific
diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl
index cf7fe47..735ca98 100644
--- a/src/mainboard/samsung/lumpy/dsdt.asl
+++ b/src/mainboard/samsung/lumpy/dsdt.asl
@@ -36,7 +36,5 @@
// mainboard specific devices
#include "acpi/mainboard.asl"
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}
diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl
index 1202ca7..816247b 100644
--- a/src/mainboard/samsung/stumpy/dsdt.asl
+++ b/src/mainboard/samsung/stumpy/dsdt.asl
@@ -31,7 +31,5 @@
}
}
- #include <vendorcode/google/chromeos/acpi/chromeos.asl>
-
#include <southbridge/intel/common/acpi/sleepstates.asl>
}