diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 17:44:57 +0400 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-04 17:44:57 +0400 |
commit | fed029f3c31b7d5df674b5090a13356b631918c7 (patch) | |
tree | f1948b23396505a4f5568ab9d37800235b815e0b /common | |
parent | be08abc2429c2e9cbce3d0abc1d315171d683520 (diff) | |
parent | 4fdebefa453a58c7b4ca653ab40f7a9791aba6c9 (diff) | |
download | u-boot-fed029f3c31b7d5df674b5090a13356b631918c7.tar.xz |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'common')
-rw-r--r-- | common/hash.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/common/hash.c b/common/hash.c index f5badcb930..c9ac33e2c4 100644 --- a/common/hash.c +++ b/common/hash.c @@ -25,6 +25,7 @@ #include <common.h> #include <command.h> +#include <hw_sha.h> #include <hash.h> #include <sha1.h> #include <sha256.h> @@ -37,6 +38,23 @@ */ static struct hash_algo hash_algo[] = { /* + * CONFIG_SHA_HW_ACCEL is defined if hardware acceleration is + * available. + */ +#ifdef CONFIG_SHA_HW_ACCEL + { + "sha1", + SHA1_SUM_LEN, + hw_sha1, + CHUNKSZ_SHA1, + }, { + "sha256", + SHA256_SUM_LEN, + hw_sha256, + CHUNKSZ_SHA256, + }, +#endif + /* * This is CONFIG_CMD_SHA1SUM instead of CONFIG_SHA1 since otherwise * it bloats the code for boards which use SHA1 but not the 'hash' * or 'sha1sum' commands. |