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>

diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 3ac4f3b235df78b9544692a075e0eb788ab4e487..9e2f1b06f3ca0e4f91019b1d7d9468f4caf71d62 100644 (file)
--- 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 07e662a51bc6d1c528cb1ad4e2b818a3d542659b..190505c11c74e06a6753353b6ade455ebea6ecac 100644 (file)
--- 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 5576bcf32eeb37739465fb0ecc610edaf2259398..4771e6b7d1c3b4e434737be26499b9e5e1e8cdee 100644 (file)
--- 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.