diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 07:25:08 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 07:25:08 (GMT) |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /drivers/crypto/ace_sha.h | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
| download | u-boot-fsl-qoriq-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.tar.xz | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'drivers/crypto/ace_sha.h')
| -rw-r--r-- | drivers/crypto/ace_sha.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/crypto/ace_sha.h b/drivers/crypto/ace_sha.h index a426d52..f1097f7 100644 --- a/drivers/crypto/ace_sha.h +++ b/drivers/crypto/ace_sha.h @@ -72,9 +72,10 @@ struct exynos_ace_sfr { unsigned char res12[0x30]; unsigned int hash_result[8]; unsigned char res13[0x20]; - unsigned int hash_seed[8]; - unsigned int hash_prng[8]; - unsigned char res14[0x180]; + unsigned int hash_seed[5]; + unsigned char res14[12]; + unsigned int hash_prng[5]; + unsigned char res15[0x18c]; unsigned int pka_sfr[5]; /* base + 0x700 */ }; @@ -291,6 +292,7 @@ struct exynos_ace_sfr { #define ACE_HASH_PRNGERROR_MASK (1 << 7) #define ACE_HASH_PRNGERROR_OFF (0 << 7) #define ACE_HASH_PRNGERROR_ON (1 << 7) +#define ACE_HASH_PRNG_REG_NUM 5 #define ACE_SHA_TYPE_SHA1 1 #define ACE_SHA_TYPE_SHA256 2 |