diff options
| author | Simon Glass <sjg@chromium.org> | 2018-10-01 12:22:38 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-10-09 04:40:27 -0600 |
| commit | a12ef7e26a69213869badc02c0f3267816200024 (patch) | |
| tree | 4c2c51c62639e3980fa47313ee81888503a3aa02 | |
| parent | 590cee8315e94e729493d2ecd8a604bcfbfa7d0e (diff) | |
| download | u-boot-a12ef7e26a69213869badc02c0f3267816200024.tar.gz | |
cros_ec: Update cros_ec_read_hash() to specify the image
Allow selection of which EC image to hash.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | cmd/cros_ec.c | 2 | ||||
| -rw-r--r-- | drivers/misc/cros_ec.c | 7 | ||||
| -rw-r--r-- | include/cros_ec.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index 3ac4f3b235..9e2f1b06f3 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -149,7 +149,7 @@ static int do_cros_ec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct ec_response_vboot_hash hash; int i; - if (cros_ec_read_hash(dev, &hash)) { + if (cros_ec_read_hash(dev, EC_VBOOT_HASH_OFFSET_ACTIVE, &hash)) { debug("%s: Could not read KBC hash\n", __func__); return 1; } diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 07e662a51b..190505c11c 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -444,13 +444,14 @@ static int cros_ec_wait_on_hash_done(struct udevice *dev, return 0; } - -int cros_ec_read_hash(struct udevice *dev, struct ec_response_vboot_hash *hash) +int cros_ec_read_hash(struct udevice *dev, uint hash_offset, + struct ec_response_vboot_hash *hash) { struct ec_params_vboot_hash p; int rv; p.cmd = EC_VBOOT_HASH_GET; + p.offset = hash_offset; if (ec_command(dev, EC_CMD_VBOOT_HASH, 0, &p, sizeof(p), hash, sizeof(*hash)) < 0) return -1; @@ -473,7 +474,7 @@ int cros_ec_read_hash(struct udevice *dev, struct ec_response_vboot_hash *hash) p.cmd = EC_VBOOT_HASH_START; p.hash_type = EC_VBOOT_HASH_TYPE_SHA256; p.nonce_size = 0; - p.offset = EC_VBOOT_HASH_OFFSET_ACTIVE; + p.offset = hash_offset; if (ec_command(dev, EC_CMD_VBOOT_HASH, 0, &p, sizeof(p), hash, sizeof(*hash)) < 0) diff --git a/include/cros_ec.h b/include/cros_ec.h index 5576bcf32e..4771e6b7d1 100644 --- a/include/cros_ec.h +++ b/include/cros_ec.h @@ -96,10 +96,12 @@ int cros_ec_read_current_image(struct udevice *dev, * Read the hash of the CROS-EC device firmware. * * @param dev CROS-EC device + * @param hash_offset Offset in flash to read from * @param hash Destination for hash information * @return 0 if ok, <0 on error */ -int cros_ec_read_hash(struct udevice *dev, struct ec_response_vboot_hash *hash); +int cros_ec_read_hash(struct udevice *dev, uint hash_offset, + struct ec_response_vboot_hash *hash); /** * Send a reboot command to the CROS-EC device. |