diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
commit | d31dd3b596190bdecbd109e404f16bd208fe32ba (patch) | |
tree | d862bd67736079799b474d876f38b75032ade5b6 /lib | |
parent | 2c871f9e084b2c03d1961884228a6901387ab8d6 (diff) | |
parent | 683b7c2a170a71bded99bb9e7dfd26372427ca1c (diff) |
Merge branch '2020-01-24-master-imports'
- Enable fastboot on some MediaTek platforms
- DMA enchancements
- Assorted bugfixes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 3 | ||||
-rw-r--r-- | lib/Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index d040a87d26c..ab6aff710dd 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -150,7 +150,8 @@ config REGEX choice prompt "Pseudo-random library support type" - depends on NET_RANDOM_ETHADDR || RANDOM_UUID || CMD_UUID + depends on NET_RANDOM_ETHADDR || RANDOM_UUID || CMD_UUID || \ + RNG_SANDBOX || UT_LIB && AES default LIB_RAND help Select the library to provide pseudo-random number generator diff --git a/lib/Makefile b/lib/Makefile index 51eba80b896..15259d0473c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -58,7 +58,7 @@ obj-$(CONFIG_TPM_V1) += tpm-v1.o obj-$(CONFIG_TPM_V2) += tpm-v2.o endif -obj-$(CONFIG_RSA) += rsa/ +obj-$(CONFIG_$(SPL_)RSA) += rsa/ obj-$(CONFIG_SHA1) += sha1.o obj-$(CONFIG_SHA256) += sha256.o |