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>
Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... File src/mainboard/google/volteer/dsdt.asl:
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... PS1, Line 53: #include <soc/intel/tigerlake/acpi/ipu.asl> Checking now whether this will be required for USB-based camera. If it is, I will fix this CL.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... File src/mainboard/google/volteer/Kconfig:
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... PS1, Line 81: : 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 I don't think you need VARIANT_SPECIFIC_OPTIONS_*. Instead you can directly select VARIANT_HAS_MIPI_CAMERA from Kconfig.name for variants that need it. Eventually, I am hoping we can get rid of this Kconfig anyways.
Hello Jes Klinke, William Wei, Furquan Shaikh, Caveh Jalali,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/40578
to look at the new patch set (#2).
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 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 --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/Kconfig.name 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 6 files changed, 18 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/40578/2
Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... File src/mainboard/google/volteer/Kconfig:
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... PS1, Line 81: : 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
I don't think you need VARIANT_SPECIFIC_OPTIONS_*. […]
Done
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... File src/mainboard/google/volteer/dsdt.asl:
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... PS1, Line 53: #include <soc/intel/tigerlake/acpi/ipu.asl>
Checking now whether this will be required for USB-based camera. If it is, I will fix this CL.
I've confirmed that ipu.asl is only needed for mipi_camera, so the code is good to go as it is.
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 2: Code-Review+2
Nick Vaccaro has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... File src/mainboard/google/volteer/dsdt.asl:
https://review.coreboot.org/c/coreboot/+/40578/1/src/mainboard/google/voltee... PS1, Line 53: #include <soc/intel/tigerlake/acpi/ipu.asl>
I've confirmed that ipu.asl is only needed for mipi_camera, so the code is good to go as it is.
Done
William Wei has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 3: Code-Review+1
It looks good to me.
William Wei has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 4:
Ping...
Nick Vaccaro has submitted this change. ( 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 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 --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/Kconfig.name 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 6 files changed, 18 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved William Wei: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 04b2bb0..641ece1 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -76,4 +76,8 @@ 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 62aabb1..f7d0909 100644 --- a/src/mainboard/google/volteer/Kconfig.name +++ b/src/mainboard/google/volteer/Kconfig.name @@ -11,7 +11,9 @@ 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 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>
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40578 )
Change subject: mb/google/volteer: move mipi_camera.asl to variants folders ......................................................................
Patch Set 6:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2816 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2815 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2814 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/2813
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Furquan Shaikh (Code Review)
-
Nick Vaccaro (Code Review)
-
William Wei (Code Review)