~funderscore blog cgit wiki get in touch
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
committerTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
commit0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch)
tree0249ca6a72069c709655a636fff70a931e5aa355 /arch/arm/mach-imx/mx7
parent6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff)
parentc91feda87ce33c81acc51cc4bf69d613c4fe89de (diff)
downloadu-boot-kii-pro-master.tar.gz
Merge branch '2023-08-28-assorted-important-fixes'HEADmaster
- 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 'arch/arm/mach-imx/mx7')
-rw-r--r--arch/arm/mach-imx/mx7/Kconfig8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 0bb18f6520..3c0208e13d 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -24,14 +24,6 @@ config SPL_TEXT_BASE
depends on SPL
default 0x00912000
-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.
-
choice
prompt "MX7 board select"
optional