diff options
author | Randall Spangler <rspangler@chromium.org> | 2012-07-17 09:58:17 -0700 |
---|---|---|
committer | Gerrit <chrome-bot@google.com> | 2012-07-17 13:11:44 -0700 |
commit | fc7b64e186723f32a00663f51161a467af58c2f3 (patch) | |
tree | 7b7b3e0b65f4cca2ea91b0743b196dbd95926c9f /util | |
parent | c44c17890c2fbda1edc74361b0174fed405f9eee (diff) | |
download | chrome-ec-fc7b64e186723f32a00663f51161a467af58c2f3.tar.gz |
Remove firmware B
BUG=chrome-os-partner:11449
TEST=build link, snow, bds; ectool reboot_ec cold to make sure enums line up
Change-Id: Ie09db2080a00f1a7e2c05579b9b41ea5137c1af0
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/27658
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'util')
-rw-r--r-- | util/burn_my_ec.c | 8 | ||||
-rw-r--r-- | util/ectool.c | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/util/burn_my_ec.c b/util/burn_my_ec.c index 71fdfd740e..f6f0ac3f1a 100644 --- a/util/burn_my_ec.c +++ b/util/burn_my_ec.c @@ -34,13 +34,11 @@ enum ec_current_image get_version(enum ec_current_image *version_ptr) /* Ensure versions are null-terminated before we print them */ r.version_string_ro[sizeof(r.version_string_ro) - 1] = '\0'; r.version_string_rw_a[sizeof(r.version_string_rw_a) - 1] = '\0'; - r.version_string_rw_b[sizeof(r.version_string_rw_b) - 1] = '\0'; build_info[sizeof(build_info) - 1] = '\0'; /* Print versions */ printf("RO version: %s\n", r.version_string_ro); - printf("RW-A version: %s\n", r.version_string_rw_a); - printf("RW-B version: %s\n", r.version_string_rw_b); + printf("RW version: %s\n", r.version_string_rw_a); printf("Firmware copy: %s\n", (r.current_image < sizeof(part_name)/sizeof(part_name[0]) ? part_name[r.current_image] : "?")); @@ -140,10 +138,6 @@ int main(int argc, char *argv[]) if (comm_init() < 0) return -3; -#ifdef CONFIG_RW_B - flash_partition(EC_IMAGE_RW_B, data + CONFIG_FW_RW_B_OFF, - CONFIG_FW_RW_B_OFF, CONFIG_FW_RW_B_SIZE); -#endif /* CONFIG_RW_B */ flash_partition(EC_IMAGE_RW_A, data + CONFIG_FW_RW_OFF, CONFIG_FW_RW_OFF, CONFIG_FW_RW_SIZE); flash_partition(EC_IMAGE_RO, data + CONFIG_FW_RO_OFF, diff --git a/util/ectool.c b/util/ectool.c index 993669ff05..ede7f3a828 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -99,8 +99,8 @@ const char help_str[] = " Set keyboard backlight in percent\n" " readtest <patternoffset> <size>\n" " Reads a pattern from the EC via LPC\n" - " reboot_ec <RO|A|B|disable-jump> [at-shutdown]\n" - " Reboot EC to RO or RW A/B\n" + " reboot_ec <RO|A|disable-jump> [at-shutdown]\n" + " Reboot EC to RO or RW\n" " sertest\n" " Serial output test for COM2\n" " switches\n" @@ -296,13 +296,11 @@ int cmd_version(int argc, char *argv[]) /* Ensure versions are null-terminated before we print them */ r.version_string_ro[sizeof(r.version_string_ro) - 1] = '\0'; r.version_string_rw_a[sizeof(r.version_string_rw_a) - 1] = '\0'; - r.version_string_rw_b[sizeof(r.version_string_rw_b) - 1] = '\0'; build_string[sizeof(build_string) - 1] = '\0'; /* Print versions */ printf("RO version: %s\n", r.version_string_ro); - printf("RW-A version: %s\n", r.version_string_rw_a); - printf("RW-B version: %s\n", r.version_string_rw_b); + printf("RW version: %s\n", r.version_string_rw_a); printf("Firmware copy: %s\n", (r.current_image < ARRAY_SIZE(fw_copies) ? fw_copies[r.current_image] : "?")); @@ -399,8 +397,6 @@ int cmd_reboot_ec(int argc, char *argv[]) p.cmd = EC_REBOOT_JUMP_RO; else if (!strcmp(argv[1], "A")) p.cmd = EC_REBOOT_JUMP_RW_A; - else if (!strcmp(argv[1], "B")) - p.cmd = EC_REBOOT_JUMP_RW_B; else if (!strcmp(argv[1], "cold")) p.cmd = EC_REBOOT_COLD; else if (!strcmp(argv[1], "disable-jump")) |