ARM: dts: DRA7: use new dra7-specific compatible string

[people/ms/u-boot.git] / common / image-sig.c

diff --git a/common/image-sig.c b/common/image-sig.c
index 455f2b96294985af5fb7fb9011bb45e2bc8b33b3..d9f712fc1e04185316c1d9bdeb54da2ff529580c 100644 (file)
--- a/common/image-sig.c
+++ b/common/image-sig.c
@@ -32,42 +32,42 @@ void *image_get_host_blob(void)
 
 struct checksum_algo checksum_algos[] = {
        {
-               "sha1",
-               SHA1_SUM_LEN,
-               SHA1_DER_LEN,
-               sha1_der_prefix,
+               .name = "sha1",
+               .checksum_len = SHA1_SUM_LEN,
+               .der_len = SHA1_DER_LEN,
+               .der_prefix = sha1_der_prefix,
 #if IMAGE_ENABLE_SIGN
-               EVP_sha1,
+               .calculate_sign = EVP_sha1,
 #endif
-               hash_calculate,
+               .calculate = hash_calculate,
        },
        {
-               "sha256",
-               SHA256_SUM_LEN,
-               SHA256_DER_LEN,
-               sha256_der_prefix,
+               .name = "sha256",
+               .checksum_len = SHA256_SUM_LEN,
+               .der_len = SHA256_DER_LEN,
+               .der_prefix = sha256_der_prefix,
 #if IMAGE_ENABLE_SIGN
-               EVP_sha256,
+               .calculate_sign = EVP_sha256,
 #endif
-               hash_calculate,
+               .calculate = hash_calculate,
        }
 
 };
 
 struct crypto_algo crypto_algos[] = {
        {
-               "rsa2048",
-               RSA2048_BYTES,
-               rsa_sign,
-               rsa_add_verify_data,
-               rsa_verify,
+               .name = "rsa2048",
+               .key_len = RSA2048_BYTES,
+               .sign = rsa_sign,
+               .add_verify_data = rsa_add_verify_data,
+               .verify = rsa_verify,
        },
        {
-               "rsa4096",
-               RSA4096_BYTES,
-               rsa_sign,
-               rsa_add_verify_data,
-               rsa_verify,
+               .name = "rsa4096",
+               .key_len = RSA4096_BYTES,
+               .sign = rsa_sign,
+               .add_verify_data = rsa_add_verify_data,
+               .verify = rsa_verify,
        }
 
 };
@@ -347,7 +347,7 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode,
 
        /*
         * Each node can generate one region for each sub-node. Allow for
-        * 7 sub-nodes (hash@1, signature@1, etc.) and some extra.
+        * 7 sub-nodes (hash-1, signature-1, etc.) and some extra.
         */
        max_regions = 20 + count * 7;
        struct fdt_region fdt_regions[max_regions];