The Qualcomm TrustZone interface memory allocator is specific to
Qualcomm firmware.  Hence add a dependency on QCOM_TZMEM, to prevent
asking the user about these options when configuring a kernel without
Qualcomm firmware support.  Various Qualcomm drivers already select the
main QCOM_SCM gatekeeper symbol, which in turn selects QCOM_TZMEM, so it
is auto-enabled when needed.

While at it, add "Qualcomm" to the one-line summary for the choice
option, to make it clear this is not related to generic TrustZone
support.

Fixes: 84f5a7b67b61bfeb ("firmware: qcom: add a dedicated TrustZone buffer allocator")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/firmware/qcom/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/qcom/Kconfig b/drivers/firmware/qcom/Kconfig
index 7f6eb41747346a4f..c607574397e9a7e7 100644
--- a/drivers/firmware/qcom/Kconfig
+++ b/drivers/firmware/qcom/Kconfig
@@ -15,7 +15,8 @@ config QCOM_TZMEM
 	select GENERIC_ALLOCATOR
 
 choice
-	prompt "TrustZone interface memory allocator mode"
+	prompt "Qualcomm TrustZone interface memory allocator mode"
+	depends on QCOM_TZMEM
 	default QCOM_TZMEM_MODE_GENERIC
 	help
 	  Selects the mode of the memory allocator providing memory buffers of
-- 
2.34.1

On Tue, 16 Jul 2024 at 15:12, Geert Uytterhoeven
<geert+renesas@glider.be> wrote:
>
> The Qualcomm TrustZone interface memory allocator is specific to
> Qualcomm firmware.  Hence add a dependency on QCOM_TZMEM, to prevent
> asking the user about these options when configuring a kernel without
> Qualcomm firmware support.  Various Qualcomm drivers already select the
> main QCOM_SCM gatekeeper symbol, which in turn selects QCOM_TZMEM, so it
> is auto-enabled when needed.
>
> While at it, add "Qualcomm" to the one-line summary for the choice
> option, to make it clear this is not related to generic TrustZone
> support.
>
> Fixes: 84f5a7b67b61bfeb ("firmware: qcom: add a dedicated TrustZone buffer allocator")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  drivers/firmware/qcom/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/qcom/Kconfig b/drivers/firmware/qcom/Kconfig
> index 7f6eb41747346a4f..c607574397e9a7e7 100644
> --- a/drivers/firmware/qcom/Kconfig
> +++ b/drivers/firmware/qcom/Kconfig
> @@ -15,7 +15,8 @@ config QCOM_TZMEM
>         select GENERIC_ALLOCATOR
>
>  choice
> -       prompt "TrustZone interface memory allocator mode"
> +       prompt "Qualcomm TrustZone interface memory allocator mode"
> +       depends on QCOM_TZMEM
>         default QCOM_TZMEM_MODE_GENERIC
>         help
>           Selects the mode of the memory allocator providing memory buffers of
> --
> 2.34.1
>

Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>