diff options
| author | Sheng-Liang Song <ssl@chromium.org> | 2015-04-15 11:03:06 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-14 07:52:45 +0000 |
| commit | be99fa290e7f50699c4ec103eafed6077303b15a (patch) | |
| tree | a86a87a24e660414c2f8169483cd41bf2b6cc9d9 | |
| parent | 58382b98f24a83d6fdd94d1616a5a4639ebdf32e (diff) | |
| download | chrome-ec-be99fa290e7f50699c4ec103eafed6077303b15a.tar.gz | |
sb_firmware: Enable Updates for Simplo Battery Only.
If can get battery info, enable updates if it is Simplo Battery.
If can not get battery info, assume a Simplo Battery is a bad state.
BUG=chrome-os-partner:36310
BRANCH=none
TEST=Verified on Glimmer.
crosh> battery_firmware check
crosh> battery_firmware update
Change-Id: I0db6b50b5a382b72fd9682621990d0a6dd9e6a2b
Signed-off-by: Sheng-Liang Song <ssl@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/266044
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | util/ec_sb_firmware_update.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/util/ec_sb_firmware_update.c b/util/ec_sb_firmware_update.c index 06b1cf8656..66486fd2dc 100644 --- a/util/ec_sb_firmware_update.c +++ b/util/ec_sb_firmware_update.c @@ -18,6 +18,9 @@ #include "misc_util.h" #include "powerd_lock.h" +#define SIMPLO_MAKER_ID 0x5 +#define SIMPLO_HWID 0x74 + /* Subcommands: [check|update] */ enum { OP_UNKNOWN = 0, @@ -313,9 +316,10 @@ static int get_info(struct sb_fw_update_info *info) } while ((rv < 0) && (cnt++ < SB_FW_UPDATE_DEFAULT_RETRY_CNT)); if (rv < 0) { - printf("Firmware Update Get Info Error\n"); + memset(info, 0, SB_FW_UPDATE_CMD_INFO_SIZE); return -EC_RES_ERROR; } + memcpy(info, resp->info.data, SB_FW_UPDATE_CMD_INFO_SIZE); return EC_RES_SUCCESS; } @@ -421,6 +425,12 @@ static enum fw_update_state s1_read_battery_info( } print_info(&fw_update->info); + if ((fw_update->info.maker_id != SIMPLO_MAKER_ID) || + (fw_update->info.hardware_id != SIMPLO_HWID)) { + log_msg(fw_update, S1_READ_INFO, "No Updates."); + return S10_TERMINAL; + } + sprintf(fw_update->image_name, "/lib/firmware/battery/maker.%04x.hwid.%04x.bin", fw_update->info.maker_id, |