diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2022-10-28 09:28:51 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-11-04 04:50:19 +0000 |
| commit | 84d6d31da5bb04997c6c0929bedafeb95dc4933d (patch) | |
| tree | 772f201fdbe781acd3185e044c9e6310ab36caa1 | |
| parent | 1d503ca814c5b19625213fb77a87c3551e717cba (diff) | |
| download | vboot-84d6d31da5bb04997c6c0929bedafeb95dc4933d.tar.gz | |
futility: updater: change default servo programmer to raiden_debug_spi
Servo v2 is deprecated, so we should change the default servo programmer
to the servo micro/C2D2 programmer (raiden_debug_spi).
BUG=b:256007307,b:256048551
TEST=make; run tests
BRANCH=None
Change-Id: Ie42d79ed2b7bd664dfdf01f4631665bac23040f2
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3989704
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4005140
Reviewed-by: Reka Norman <rekanorman@chromium.org>
Tested-by: Kangheui Won <khwon@chromium.org>
Commit-Queue: Kangheui Won <khwon@chromium.org>
| -rw-r--r-- | futility/updater_utils.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/futility/updater_utils.c b/futility/updater_utils.c index c5f0ed65..af94690a 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -470,6 +470,7 @@ char *host_detect_servo(const char **prepare_ctrl_name) /* By default, no control is needed. */ *prepare_ctrl_name = NULL; + VB2_DEBUG("servo_type: %s\n", servo_type); /* Get serial name if servo port is provided. */ if ((servo_port && *servo_port) || (servo_name && *servo_name)) { @@ -490,17 +491,14 @@ char *host_detect_servo(const char **prepare_ctrl_name) VB2_DEBUG("Servo SN=%s (serial cmd: %s)\n", servo_serial, cmd); } + /* servo_type names: chromite/lib/firmware/servo_lib.py */ if (!*servo_type) { ERROR("Failed to get servo type. Check servod.\n"); } else if (servo_serial && !*servo_serial) { ERROR("Failed to get serial at servo port %s.\n", servo_port); - } else if (strstr(servo_type, "servo_micro")) { - VB2_DEBUG("Selected Servo Micro.\n"); - programmer = "raiden_debug_spi"; - *prepare_ctrl_name = cpu_fw_spi; - } else if (strstr(servo_type, "c2d2")) { - VB2_DEBUG("Selected C2D2.\n"); - programmer = "raiden_debug_spi"; + } else if (strcmp(servo_type, "servo_v2") == 0) { + VB2_DEBUG("Selected Servo V2.\n"); + programmer = "ft2232_spi:type=google-servo-v2"; *prepare_ctrl_name = cpu_fw_spi; } else if (strstr(servo_type, "ccd_cr50") || strstr(servo_type, "ccd_gsc") || @@ -509,8 +507,13 @@ char *host_detect_servo(const char **prepare_ctrl_name) programmer = "raiden_debug_spi:target=AP,custom_rst=true"; *prepare_ctrl_name = ccd_cpu_fw_spi; } else { - VB2_DEBUG("Selected Servo V2.\n"); - programmer = "ft2232_spi:type=google-servo-v2"; + if (strstr(servo_type, "servo_micro")) + VB2_DEBUG("Selected Servo Micro.\n"); + else if (strstr(servo_type, "c2d2")) + VB2_DEBUG("Selected C2D2.\n"); + else + WARN("Unknown servo: %s\n", servo_type); + programmer = "raiden_debug_spi"; *prepare_ctrl_name = cpu_fw_spi; } |