diff options
| -rw-r--r-- | util/comm-host.c | 7 | ||||
| -rw-r--r-- | util/ectool.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/util/comm-host.c b/util/comm-host.c index 31ad56343e..9fc65ab634 100644 --- a/util/comm-host.c +++ b/util/comm-host.c @@ -10,6 +10,7 @@ #include <string.h> #include "comm-host.h" +#include "cros_ec_dev.h" #include "ec_commands.h" #include "misc_util.h" @@ -96,6 +97,11 @@ int comm_init(int interfaces, const char *device_name) !comm_init_dev(device_name)) goto init_ok; + /* Do not fallback to other communication methods if target is not a + * cros_ec device */ + if (strcmp(CROS_EC_DEV_NAME, device_name)) + goto init_failed; + /* Fallback to direct LPC on x86 */ if ((interfaces & COMM_LPC) && comm_init_lpc && !comm_init_lpc()) goto init_ok; @@ -104,6 +110,7 @@ int comm_init(int interfaces, const char *device_name) if ((interfaces & COMM_I2C) && comm_init_i2c && !comm_init_i2c()) goto init_ok; + init_failed: /* Give up */ fprintf(stderr, "Unable to establish host communication\n"); return 1; diff --git a/util/ectool.c b/util/ectool.c index e843fc7308..7b70ab84d6 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -18,6 +18,7 @@ #include "battery.h" #include "comm-host.h" #include "compile_time_macros.h" +#include "cros_ec_dev.h" #include "ec_panicinfo.h" #include "ec_flash.h" #include "ectool.h" @@ -7330,7 +7331,7 @@ int main(int argc, char *argv[]) const struct command *cmd; int dev = 0; int interfaces = COMM_ALL; - char device_name[40] = "cros_ec"; + char device_name[40] = CROS_EC_DEV_NAME; int rv = 1; int parse_error = 0; char *e; |