diff options
author | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
commit | 0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch) | |
tree | 0249ca6a72069c709655a636fff70a931e5aa355 /lib | |
parent | 6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff) | |
parent | c91feda87ce33c81acc51cc4bf69d613c4fe89de (diff) | |
download | u-boot-kii-pro-master.tar.gz |
- A few platform-specific config/dts updates to fix issues, drop a
temporary change in binman, update the MAINTAINERS file to remove
Wolfgang Denk, fix a typo, fix a corner case with bootstd, update
Azure to not timeout so easily, and fix a case where we would omit
some files in SPL.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile | 6 | ||||
-rw-r--r-- | lib/optee/Kconfig | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index 8d8ccc8bbc..9fa573525b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -72,9 +72,9 @@ obj-$(CONFIG_ECDSA) += ecdsa/ obj-$(CONFIG_$(SPL_)RSA) += rsa/ obj-$(CONFIG_HASH) += hash-checksum.o obj-$(CONFIG_BLAKE2) += blake2/blake2b.o -obj-$(CONFIG_SHA1) += sha1.o -obj-$(CONFIG_SHA256) += sha256.o -obj-$(CONFIG_SHA512) += sha512.o +obj-$(CONFIG_$(SPL_)SHA1) += sha1.o +obj-$(CONFIG_$(SPL_)SHA256) += sha256.o +obj-$(CONFIG_$(SPL_)SHA512) += sha512.o obj-$(CONFIG_CRYPT_PW) += crypt/ obj-$(CONFIG_$(SPL_)ASN1_DECODER) += asn1_decoder.o diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig index 517136a448..e6834d4d3e 100644 --- a/lib/optee/Kconfig +++ b/lib/optee/Kconfig @@ -11,6 +11,14 @@ config OPTEE_IMAGE This option enable the OPTEE specific checks done before booting an OPTEE image created with mkimage +config OPTEE_TZDRAM_SIZE + hex "Amount of Trust-Zone RAM for the OPTEE image" + default 0x0000000 + depends on OPTEE_LIB + help + The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE + runtime. + config BOOTM_OPTEE bool "Support OPTEE bootm command" select BOOTM_LINUX |