commit 160904567282fb18b9c42e5bff65e65a45d408e1
author Sam McNally <sammc@chromium.org> Wed Feb 16 19:49:41 2022 +1100
committer Commit Bot <commit-bot@chromium.org> Thu Mar 03 11:29:20 2022 +0000
tree 74f4190b69351d9d51621403da7ff111bc550f01
parent a824e1e710b9038cf99fa3f08f47dbc1faa83d99

futility: Support C2D2 with futility update --servo.

C2D2 is used similarly to servo micro. Mirror the servo micro logic
accordingly.

BUG=b:220992685
TEST=futility update --servo over C2D2 with and with servo v4
BRANCH=None

Cq-Depend: chromium:3470605
Change-Id: I298fe5847abba0957fa5c2da4e1981a7da9e0428
Signed-off-by: Sam McNally <sammc@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3469746
Reviewed-by: Reka Norman <rekanorman@chromium.org>

futility/updater_utils.c

diff --git a/futility/updater_utils.c b/futility/updater_utils.c
index ce93e57..fc0bb4c 100644
--- a/futility/updater_utils.c
+++ b/futility/updater_utils.c
@@ -475,6 +475,9 @@
 		if (strstr(servo_type, "with_servo_micro"))
 			cmd = ("dut-control -o servo_micro_serialname"
 			       " 2>/dev/null");
+		else if (strstr(servo_type, "with_c2d2"))
+			cmd = ("dut-control -o c2d2_serialname"
+			       " 2>/dev/null");
 		else if (strstr(servo_type, "with_ccd"))
 			cmd = "dut-control -o ccd_serialname 2>/dev/null";
 
@@ -490,6 +493,10 @@
 		VB2_DEBUG("Selected Servo Micro.\n");
 		programmer = "raiden_debug_spi";
 		need_prepare = 1;
+	} else if (strstr(servo_type, "c2d2")) {
+		VB2_DEBUG("Selected C2D2.\n");
+		programmer = "raiden_debug_spi";
+		need_prepare = 1;
 	} else if (strstr(servo_type, "ccd_cr50") ||
 		   strstr(servo_type, "ccd_gsc")) {
 		VB2_DEBUG("Selected CCD.\n");