sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/poppy: Add config option for camera ACPI support

Browse Source 
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>
This commit is contained in:
Furquan Shaikh
2017-12-04 12:43:19 -08:00
committed by Furquan Shaikh
parent e7b0dcea7d
commit fc20ee43d7
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/poppy/Kconfig
View File

@@ -90,6 +90,11 @@ config VARIANT_HAS_I2C_TPM
select MAINBOARD_HAS_I2C_TPM_CR50 select MAINBOARD_HAS_I2C_TPM_CR50
select TPM2 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. # Select this option to enable use of cr50 SPI TPM on the variant.
config VARIANT_HAS_SPI_TPM config VARIANT_HAS_SPI_TPM
bool bool
@@ -102,6 +107,7 @@ config VARIANT_SPECIFIC_OPTIONS_POPPY
def_bool n def_bool n
select DRIVERS_I2C_MAX98927 select DRIVERS_I2C_MAX98927
select NO_FADT_8042 select NO_FADT_8042
select VARIANT_HAS_CAMERA_ACPI
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
config VARIANT_SPECIFIC_OPTIONS_NAUTILUS config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
@@ -114,6 +120,7 @@ config VARIANT_SPECIFIC_OPTIONS_SORAKA
def_bool n def_bool n
select DRIVERS_I2C_MAX98927 select DRIVERS_I2C_MAX98927
select NO_FADT_8042 select NO_FADT_8042
select VARIANT_HAS_CAMERA_ACPI
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
config VBOOT config VBOOT

2
src/mainboard/google/poppy/dsdt.asl
View File

@@ -49,8 +49,10 @@ DefinitionBlock(
} }
} }
#if IS_ENABLED(CONFIG_VARIANT_HAS_CAMERA_ACPI)
/* Camera */ /* Camera */
#include <variant/acpi/camera.asl> #include <variant/acpi/camera.asl>
#endif
/* Chrome OS specific */ /* Chrome OS specific */
#include <vendorcode/google/chromeos/acpi/chromeos.asl> #include <vendorcode/google/chromeos/acpi/chromeos.asl>

16
src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl
View File

@@ -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. */