From e99d9795d563f063a9dde1017c55d061affccae9 Mon Sep 17 00:00:00 2001 From: CHLin Date: Wed, 12 Jul 2017 14:02:15 +0800 Subject: [PATCH] util: ecst: Add support for chip variant npcx7m6g This CL adds support for chip variant npcx7m6g in ecst utility. BRANCH=none BUG=none TEST=No build errors for make buildall. Build npcx7_evb board and upload firmware on EVB. No symptom found. Change-Id: I156e0a8f183397ad713c7134b3a0ad5fe78b0d83 Signed-off-by: CHLin Reviewed-on: https://chromium-review.googlesource.com/567942 Commit-Ready: Jun Lin Tested-by: Jun Lin Reviewed-by: Aseda Aboagye Reviewed-by: Mulin Chao --- util/ecst.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/util/ecst.c b/util/ecst.c index 7ba1acae2c..142160ead0 100755 --- a/util/ecst.c +++ b/util/ecst.c @@ -190,7 +190,8 @@ int main(int argc, char *argv[]) "%s", main_str_temp) != 1)) { my_printf(TERR, "\nCannot read chip name, "); - my_printf(TERR, "npcx7m7k, npcx7m6f, npcx7m5g"); + my_printf(TERR, "npcx7m7k, npcx7m6f"); + my_printf(TERR, ", npcx7m6g, npcx7m5g"); my_printf(TERR, ", npcx5m5g or npcx5m6g.\n"); main_status = FALSE; } else { @@ -212,8 +213,10 @@ int main(int argc, char *argv[]) chip_info[NPCX7M7].ram_addr; g_ram_size = chip_info[NPCX7M7].ram_size; - } else if (str_cmp_no_case(main_str_temp, - "npcx7m6f") == 0) { + } else if ((str_cmp_no_case(main_str_temp, + "npcx7m6f") == 0) || + (str_cmp_no_case(main_str_temp, + "npcx7m6g") == 0)) { if ((bin_params.bin_params & BIN_FW_LOAD_START_ADDR) == 0x00000000) @@ -294,9 +297,9 @@ int main(int argc, char *argv[]) "\nInvalid chip name (%s) ", main_str_temp); my_printf(TERR, "should be npcx7m7k, "); - my_printf(TERR, "npcx7m6f, npcx7m5g, "); - my_printf(TERR, "npcx5m5g or "); - my_printf(TERR, "npcx5m6g."); + my_printf(TERR, "npcx7m6f, npcx7m6g, "); + my_printf(TERR, "npcx7m5g, npcx5m5g "); + my_printf(TERR, " or npcx5m6g."); main_status = FALSE; }