Nick Vaccaro has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
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 VARIANT_HAS_MIPI_CAMERA, VARIANT_SPECIFIC_OPTIONS_HALVOR, VARIANT_SPECIFIC_OPTIONS_MALEFOR, VARIANT_SPECIFIC_OPTIONS_RIPTO, and VARIANT_SPECIFIC_OPTIONS_VOLTEER configs.
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 --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/dsdt.asl R src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl A src/mainboard/google/volteer/variants/ripto/include/variant/acpi/mipi_camera.asl A src/mainboard/google/volteer/variants/volteer/include/variant/acpi/mipi_camera.asl 5 files changed, 30 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/40578/1
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 0870c61..b909746 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -75,4 +75,22 @@ default "ripto" if BOARD_GOOGLE_RIPTO default "volteer" if BOARD_GOOGLE_VOLTEER
+config VARIANT_HAS_MIPI_CAMERA + bool + default n + +config VARIANT_SPECIFIC_OPTIONS_HALVOR + def_bool n + +config VARIANT_SPECIFIC_OPTIONS_MALEFOR + def_bool n + +config VARIANT_SPECIFIC_OPTIONS_RIPTO + def_bool n + select VARIANT_HAS_MIPI_CAMERA + +config VARIANT_SPECIFIC_OPTIONS_VOLTEER + def_bool n + select VARIANT_HAS_MIPI_CAMERA + endif # BOARD_GOOGLE_BASEBOARD_VOLTEER diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl index 640f7cd..af881ae 100644 --- a/src/mainboard/google/volteer/dsdt.asl +++ b/src/mainboard/google/volteer/dsdt.asl @@ -47,7 +47,10 @@ }
#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 similarity index 100% rename from src/mainboard/google/volteer/acpi/mipi_camera.asl rename to 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 0000000..6df5081 --- /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 0000000..6df5081 --- /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>