From 7e7cc90e33f556f047b469e48a41fc5c130df2d8 Mon Sep 17 00:00:00 2001 From: Bryan O'Donoghue Date: Sat, 4 May 2019 01:08:23 +0100 Subject: [PATCH] optee: Make TZDRAM config options contingent on CONFIG_OPTEE Commit c7b3a7ee5351 ("optee: adjust dependencies and default values for dram") makes the TZDRAM defines for OPTEE show up for all configs as a side-effect. While not harmful its not what we really want. This patch makes the following defines contingent on CONFIG_OPTEE=y CONFIG_OPTEE_TZDRAM_BASE CONFIG_OPTEE_TZDRAM_SIZE Rightly, if you don't have CONFIG_OPTEE=y you don't care about the above two defines. Signed-off-by: Bryan O'Donoghue Cc: Rui Miguel Silva Acked-by: Rui Miguel Silva --- lib/optee/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig index 3773d89c31..c398f9b953 100644 --- a/lib/optee/Kconfig +++ b/lib/optee/Kconfig @@ -17,6 +17,7 @@ config OPTEE_LOAD_ADDR config OPTEE_TZDRAM_SIZE hex "Amount of Trust-Zone RAM for the OPTEE image" default 0x0000000 + depends on OPTEE help The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE runtime. @@ -24,6 +25,7 @@ config OPTEE_TZDRAM_SIZE config OPTEE_TZDRAM_BASE hex "Base address of Trust-Zone RAM for the OPTEE image" default 0x00000000 + depends on OPTEE help The base address of pre-allocated Trust Zone DRAM for the OPTEE runtime.