diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-12-04 12:43:19 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-12-06 18:24:13 +0000 |
| commit | fc20ee43d77f3dbfdf9f9394b670541b2efbd1e3 (patch) | |
| tree | d8f83571b12c8a0b2fc29287b6339fd23661ebc4 /src/mainboard/google | |
| parent | e7b0dcea7db652692489714f799221e0afae30eb (diff) | |
mb/google/poppy: Add config option for camera ACPI support
This change adds a new config option VARIANT_HAS_CAMERA_ACPI to allow
variants to define ACPI tables for camera support. It also prevents
boards that do not need this from unnecessarily providing dummy files
for camera ACPI support.
Change-Id: I91f8e407e0f021071eeadbde8c2695e2a6d69e06
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/22702
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/dsdt.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl | 16 |
3 files changed, 9 insertions, 16 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 6ba2a5e0b4..409bfeee6b 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -90,6 +90,11 @@ config VARIANT_HAS_I2C_TPM select MAINBOARD_HAS_I2C_TPM_CR50 select TPM2 +# Select this option to enable camera ACPI support on the variant. +config VARIANT_HAS_CAMERA_ACPI + bool + default n + # Select this option to enable use of cr50 SPI TPM on the variant. config VARIANT_HAS_SPI_TPM bool @@ -102,6 +107,7 @@ config VARIANT_SPECIFIC_OPTIONS_POPPY def_bool n select DRIVERS_I2C_MAX98927 select NO_FADT_8042 + select VARIANT_HAS_CAMERA_ACPI select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA config VARIANT_SPECIFIC_OPTIONS_NAUTILUS @@ -114,6 +120,7 @@ config VARIANT_SPECIFIC_OPTIONS_SORAKA def_bool n select DRIVERS_I2C_MAX98927 select NO_FADT_8042 + select VARIANT_HAS_CAMERA_ACPI select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA config VBOOT diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index ec45247b08..a922d10f97 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -49,8 +49,10 @@ DefinitionBlock( } } +#if IS_ENABLED(CONFIG_VARIANT_HAS_CAMERA_ACPI) /* Camera */ #include <variant/acpi/camera.asl> +#endif /* Chrome OS specific */ #include <vendorcode/google/chromeos/acpi/chromeos.asl> diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl deleted file mode 100644 index cc0c56c75f..0000000000 --- a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 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. - */ - -/* Dummy file until camera support is added. */ |