From e2837ecddc244198e3ebeac9ddb18fd439b0131f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 4 Aug 2025 15:51:11 -0600 Subject: [PATCH] sm: Rework the Kconfig logic here The symbol "SM" is a library symbol and should not be prompted for. It should be selected by the drivers that use it. In this case we need to add a SANDBOX_SM symbol for the sandbox driver. The meson SM driver cannot build on other platforms, so add the appropriate dependency. Reviewed-by: Peter Robinson Signed-off-by: Tom Rini --- configs/sandbox_defconfig | 2 +- drivers/sm/Kconfig | 11 ++++++++++- drivers/sm/Makefile | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index e9a70b26044..8c6693c693f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -324,7 +324,7 @@ CONFIG_RTC_RV8803=y CONFIG_RTC_HT1380=y CONFIG_SCSI=y CONFIG_SANDBOX_SERIAL=y -CONFIG_SM=y +CONFIG_SANDBOX_SM=y CONFIG_SMEM=y CONFIG_SANDBOX_SMEM=y CONFIG_SOUND=y diff --git a/drivers/sm/Kconfig b/drivers/sm/Kconfig index 926af286330..8e500ed2ede 100644 --- a/drivers/sm/Kconfig +++ b/drivers/sm/Kconfig @@ -1,8 +1,17 @@ config SM - bool "Enable Secure Monitor driver support" + bool config MESON_SM bool "Amlogic Secure Monitor driver" + depends on ARCH_MESON select SM help Say y here to enable the Amlogic secure monitor driver. + +config SANDBOX_SM + bool "Sandbox Secure Monitor driver" + depends on SANDBOX + select SM + help + Say y here to enable the Sandbox driver for the secure monitor + uclass. diff --git a/drivers/sm/Makefile b/drivers/sm/Makefile index da81ee898ab..5ac947350bd 100644 --- a/drivers/sm/Makefile +++ b/drivers/sm/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += sm-uclass.o -obj-$(CONFIG_SANDBOX) += sandbox-sm.o +obj-$(CONFIG_SM) += sm-uclass.o +obj-$(CONFIG_SANDBOX_SM) += sandbox-sm.o obj-$(CONFIG_MESON_SM) += meson-sm.o -- 2.47.3