diff options
-rw-r--r-- | futility/cmd_update.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/futility/cmd_update.c b/futility/cmd_update.c index 3d99664e..57fa0835 100644 --- a/futility/cmd_update.c +++ b/futility/cmd_update.c @@ -31,6 +31,7 @@ enum { OPT_QUIRKS_LIST, OPT_REPACK, OPT_SERVO, + OPT_SERVO_NORESET, OPT_SERVO_PORT, OPT_SIGNATURE, OPT_SYS_PROPS, @@ -54,6 +55,7 @@ static struct option const long_opts[] = { {"ccd", 0, NULL, OPT_CCD}, {"servo", 0, NULL, OPT_SERVO}, + {"servo_noreset", 0, NULL, OPT_SERVO_NORESET}, {"servo_port", 1, NULL, OPT_SERVO_PORT}, {"emulate", 1, NULL, OPT_EMULATE}, {"factory", 0, NULL, OPT_FACTORY}, @@ -130,6 +132,7 @@ static void print_help(int argc, char *argv[]) " --gbb_flags=FLAG\tOverride new GBB flags\n" " --ccd \tDo fast,force,wp=0,p=raiden_debug_spi\n" " --servo \tFlash using Servo (v2, v4, micro, ...)\n" + " --servo_noreset \tLike servo but with 'custom_rst=true'\n" " --servo_port=PRT\tOverride servod port, implies --servo\n" " --signature_id=S\tOverride signature ID for key files\n" " --sys_props=LIST\tList of system properties to override\n" @@ -139,12 +142,29 @@ static void print_help(int argc, char *argv[]) argv[0]); } +static char *add_servo_noreset(char *programmer) +{ + char *ret; + + if (strstr(programmer, "raiden_debug_spi:target=AP") == NULL) { + ERROR("servo_noreset only works for AP flashing over CCD.\n"); + free(programmer); + + return NULL; + } + + ASPRINTF(&ret, "%s,custom_rst=true", programmer); + free(programmer); + + return ret; +} + static int do_update(int argc, char *argv[]) { struct updater_config *cfg; struct updater_config_arguments args = {0}; int i, errorcnt = 0, do_update = 1; - int detect_servo = 0, do_servo_cpu_fw_spi = 0; + int detect_servo = 0, do_servo_cpu_fw_spi = 0, servo_noreset = 0; char *servo_programmer = NULL; char *endptr; @@ -255,6 +275,14 @@ static int do_update(int argc, char *argv[]) args.host_only = 1; detect_servo = 1; break; + case OPT_SERVO_NORESET: + args.fast_update = 1; + args.force_update = 1; + args.write_protection = "0"; + args.host_only = 1; + detect_servo = 1; + servo_noreset = 1; + break; case OPT_SERVO_PORT: setenv(ENV_SERVOD_PORT, optarg, 1); args.fast_update = 1; @@ -289,6 +317,10 @@ static int do_update(int argc, char *argv[]) if (!errorcnt && detect_servo) { servo_programmer = host_detect_servo(&do_servo_cpu_fw_spi); + + if (servo_programmer && servo_noreset) + servo_programmer = add_servo_noreset(servo_programmer); + if (!servo_programmer) errorcnt++; else if (!args.programmer) |