optee: Make TZDRAM config options contingent on CONFIG_OPTEE
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>
Sat, 4 May 2019 00:08:23 +0000 (01:08 +0100)
committerStefano Babic <sbabic@denx.de>
Fri, 19 Jul 2019 13:12:07 +0000 (15:12 +0200)
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 <bryan.odonoghue@linaro.org>
Cc: Rui Miguel Silva <rui.silva@linaro.org>
Acked-by: Rui Miguel Silva <rui.silva@linaro.org>
lib/optee/Kconfig

index 3773d89c313f083e3516abf332978bcfffefe4e4..c398f9b953577f7575b9c629a70d3ba1048bb065 100644 (file)
@@ -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.