mb/google/volteer: move mipi_camera.asl to variants folders

Moves mipi_camera.asl from mb/google/volteer/acpi/ to
mb/google/volteer/variant/baseboard/include/baseboard/acpi/.

Adds mipi_camera.asl to variant/[volteer|ripto]/include/acpi/.

Adds new VARIANT_HAS_MIPI_CAMERA Kconfig option.

Adds VARIANT_HAS_MIPI_CAMERA for volteer and ripto variants.

BUG=b:154648941, b:154646959
TEST="emerge-volteer coreboot chromeos-bootimage", flash and boot
Ripto and Volteer to kernel.

Change-Id: I2f28243dfb945857d26f27f07968a15a3eeb7a4f
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40578
Reviewed-by: William Wei <wenxu.wei@bitland.corp-partner.google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nick Vaccaro 2020-04-21 12:51:37 -07:00
parent 1463c56139
commit c97bb64aad
6 changed files with 18 additions and 1 deletions

View File

@ -76,4 +76,8 @@ config VARIANT_DIR
default "ripto" if BOARD_GOOGLE_RIPTO default "ripto" if BOARD_GOOGLE_RIPTO
default "volteer" if BOARD_GOOGLE_VOLTEER default "volteer" if BOARD_GOOGLE_VOLTEER
config VARIANT_HAS_MIPI_CAMERA
bool
default n
endif # BOARD_GOOGLE_BASEBOARD_VOLTEER endif # BOARD_GOOGLE_BASEBOARD_VOLTEER

View File

@ -11,7 +11,9 @@ config BOARD_GOOGLE_MALEFOR
config BOARD_GOOGLE_RIPTO config BOARD_GOOGLE_RIPTO
bool "-> Ripto" bool "-> Ripto"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select VARIANT_HAS_MIPI_CAMERA
config BOARD_GOOGLE_VOLTEER config BOARD_GOOGLE_VOLTEER
bool "-> Volteer" bool "-> Volteer"
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select VARIANT_HAS_MIPI_CAMERA

View File

@ -47,7 +47,10 @@ DefinitionBlock(
} }
#include <southbridge/intel/common/acpi/sleepstates.asl> #include <southbridge/intel/common/acpi/sleepstates.asl>
#if CONFIG(VARIANT_HAS_MIPI_CAMERA)
/* Camera */ /* Camera */
#include <soc/intel/tigerlake/acpi/ipu.asl> #include <soc/intel/tigerlake/acpi/ipu.asl>
#include "acpi/mipi_camera.asl" #include <variant/acpi/mipi_camera.asl>
#endif /* VARIANT_HAS_MIPI_CAMERA */
} }

View File

@ -0,0 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
#include <baseboard/acpi/mipi_camera.asl>

View File

@ -0,0 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* This file is part of the coreboot project. */
#include <baseboard/acpi/mipi_camera.asl>