summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2020-04-21 12:51:37 -0700
committerNick Vaccaro <nvaccaro@google.com>2020-04-28 20:50:25 +0000
commitc97bb64aadee241189f3c3ffae91115cbe33e58d (patch)
treeb0ea5ba65220801b3eb5ccb8de75db986f035edb
parent1463c5613984d1146a951c85e3ea3b419c09274b (diff)
downloadcoreboot-c97bb64aadee241189f3c3ffae91115cbe33e58d.tar.xz
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>
-rw-r--r--src/mainboard/google/volteer/Kconfig4
-rw-r--r--src/mainboard/google/volteer/Kconfig.name2
-rw-r--r--src/mainboard/google/volteer/dsdt.asl5
-rw-r--r--src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl (renamed from src/mainboard/google/volteer/acpi/mipi_camera.asl)0
-rw-r--r--src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl4
-rw-r--r--src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl4
6 files changed, 18 insertions, 1 deletions
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 04b2bb0f30..641ece1253 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -76,4 +76,8 @@ config VARIANT_DIR
default "ripto" if BOARD_GOOGLE_RIPTO
default "volteer" if BOARD_GOOGLE_VOLTEER
+config VARIANT_HAS_MIPI_CAMERA
+ bool
+ default n
+
endif # BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index 62aabb1858..f7d0909583 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -11,7 +11,9 @@ config BOARD_GOOGLE_MALEFOR
config BOARD_GOOGLE_RIPTO
bool "-> Ripto"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
+ select VARIANT_HAS_MIPI_CAMERA
config BOARD_GOOGLE_VOLTEER
bool "-> Volteer"
select BOARD_GOOGLE_BASEBOARD_VOLTEER
+ select VARIANT_HAS_MIPI_CAMERA
diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl
index 640f7cd7fe..af881ae859 100644
--- a/src/mainboard/google/volteer/dsdt.asl
+++ b/src/mainboard/google/volteer/dsdt.asl
@@ -47,7 +47,10 @@ DefinitionBlock(
}
#include <southbridge/intel/common/acpi/sleepstates.asl>
+
+#if CONFIG(VARIANT_HAS_MIPI_CAMERA)
/* Camera */
#include <soc/intel/tigerlake/acpi/ipu.asl>
- #include "acpi/mipi_camera.asl"
+ #include <variant/acpi/mipi_camera.asl>
+#endif /* VARIANT_HAS_MIPI_CAMERA */
}
diff --git a/src/mainboard/google/volteer/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
index 83d711bfca..83d711bfca 100644
--- a/src/mainboard/google/volteer/acpi/mipi_camera.asl
+++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl
diff --git a/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl
new file mode 100644
index 0000000000..6df508198f
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl
@@ -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>
diff --git a/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl
new file mode 100644
index 0000000000..6df508198f
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl
@@ -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>