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>
This commit is contained in:
Kyösti Mälkki 2021-01-20 23:02:16 +02:00
parent ae7ac8a723
commit ade4f3520b
40 changed files with 2 additions and 118 deletions

View File

@ -3,5 +3,7 @@
#include <acpi/acpigen_extern.asl> #include <acpi/acpigen_extern.asl>
#if CONFIG(CHROMEOS) #if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/gnvs.asl> #include <vendorcode/google/chromeos/acpi/gnvs.asl>
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif #endif

View File

@ -31,9 +31,6 @@ DefinitionBlock(
} }
} }
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific // Mainboard specific

View File

@ -33,8 +33,5 @@ DefinitionBlock(
// Mainboard devices // Mainboard devices
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -33,9 +33,6 @@ DefinitionBlock(
/* Chipset specific sleep states */ /* Chipset specific sleep states */
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)
{ {

View File

@ -34,7 +34,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -45,8 +45,6 @@ DefinitionBlock(
#include <soc/intel/common/acpi/wifi.asl> #include <soc/intel/common/acpi/wifi.asl>
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"

View File

@ -35,9 +35,6 @@ DefinitionBlock(
#include <variant/acpi/camera.asl> #include <variant/acpi/camera.asl>
#endif #endif
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -30,9 +30,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* VPD support */ /* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl> #include <vendorcode/google/chromeos/acpi/vpd.asl>

View File

@ -32,8 +32,6 @@ DefinitionBlock(
} }
#if CONFIG(CHROMEOS) #if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* VPD support */ /* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl> #include <vendorcode/google/chromeos/acpi/vpd.asl>
#endif #endif

View File

@ -32,9 +32,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -31,9 +31,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -31,9 +31,6 @@ DefinitionBlock(
#include "acpi/dptf.asl" #include "acpi/dptf.asl"
} }
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific // Mainboard specific

View File

@ -33,11 +33,6 @@ DefinitionBlock(
} }
} }
#if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -32,9 +32,6 @@ DefinitionBlock(
} }
} }
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific // Mainboard specific

View File

@ -52,9 +52,6 @@ DefinitionBlock (
/* Thermal handler */ /* Thermal handler */
#include <variant/acpi/thermal.asl> #include <variant/acpi/thermal.asl>
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)
{ {

View File

@ -34,7 +34,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -30,9 +30,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -35,7 +35,5 @@ DefinitionBlock(
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -39,9 +39,6 @@ DefinitionBlock(
#include <variant/acpi/camera.asl> #include <variant/acpi/camera.asl>
#endif #endif
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -32,8 +32,6 @@ DefinitionBlock(
#include "acpi/dptf.asl" #include "acpi/dptf.asl"
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"

View File

@ -30,9 +30,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -32,8 +32,6 @@ DefinitionBlock(
} }
#if CONFIG(CHROMEOS) #if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* VPD support */ /* VPD support */
#include <vendorcode/google/chromeos/acpi/vpd.asl> #include <vendorcode/google/chromeos/acpi/vpd.asl>
#endif #endif

View File

@ -43,8 +43,5 @@ DefinitionBlock(
// Mainboard specific // Mainboard specific
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -35,7 +35,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -36,9 +36,6 @@ DefinitionBlock(
#include "mainboard.asl" #include "mainboard.asl"
} }
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
// Chrome OS Embedded Controller // Chrome OS Embedded Controller
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)
{ {

View File

@ -44,9 +44,6 @@ DefinitionBlock (
/* Thermal handler */ /* Thermal handler */
#include <variant/acpi/thermal.asl> #include <variant/acpi/thermal.asl>
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)
{ {

View File

@ -31,11 +31,6 @@ DefinitionBlock(
/* Camera */ /* Camera */
#include <acpi/mipi_camera.asl> #include <acpi/mipi_camera.asl>
#if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#if CONFIG(EC_GOOGLE_CHROMEEC) #if CONFIG(EC_GOOGLE_CHROMEEC)
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)

View File

@ -32,7 +32,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -24,11 +24,6 @@ DefinitionBlock(
} }
} }
#if CONFIG(CHROMEOS)
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -33,7 +33,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -29,9 +29,6 @@ DefinitionBlock(
} }
} }
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */

View File

@ -30,11 +30,6 @@ DefinitionBlock(
} }
} }
#if CONFIG(CHROMEOS)
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#if CONFIG(EC_GOOGLE_CHROMEEC) #if CONFIG(EC_GOOGLE_CHROMEEC)
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)

View File

@ -30,11 +30,6 @@ DefinitionBlock(
} }
} }
#if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#if CONFIG(EC_GOOGLE_CHROMEEC) #if CONFIG(EC_GOOGLE_CHROMEEC)
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)

View File

@ -36,10 +36,5 @@ DefinitionBlock(
#include "acpi/ipu_mainboard.asl" #include "acpi/ipu_mainboard.asl"
#include "acpi/mipi_camera.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> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -30,8 +30,5 @@ DefinitionBlock(
#include "acpi/dptf.asl" #include "acpi/dptf.asl"
} }
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -40,8 +40,6 @@ DefinitionBlock(
#include <soc/intel/common/acpi/wifi.asl> #include <soc/intel/common/acpi/wifi.asl>
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"

View File

@ -32,11 +32,6 @@ DefinitionBlock(
} }
} }
#if CONFIG(CHROMEOS)
/* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
#if CONFIG(EC_GOOGLE_CHROMEEC) #if CONFIG(EC_GOOGLE_CHROMEEC)
/* Chrome OS Embedded Controller */ /* Chrome OS Embedded Controller */
Scope (\_SB.PCI0.LPCB) Scope (\_SB.PCI0.LPCB)

View File

@ -35,9 +35,6 @@ DefinitionBlock(
// Thermal handler // Thermal handler
#include "acpi/thermal.asl" #include "acpi/thermal.asl"
// Chrome OS specific
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific // Mainboard specific

View File

@ -36,7 +36,5 @@ DefinitionBlock(
// mainboard specific devices // mainboard specific devices
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }

View File

@ -31,7 +31,5 @@ DefinitionBlock(
} }
} }
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
} }