summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-08-04 15:51:11 -0600
committerTom Rini <[email protected]>2025-08-14 10:58:46 -0600
commite2837ecddc244198e3ebeac9ddb18fd439b0131f (patch)
tree674dd5fd8779550d39e4525ef9cef5a3876cc3c8
parentd68db76b95b106227a40fcf41ebf4dccb2225a0e (diff)
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 <[email protected]> Signed-off-by: Tom Rini <[email protected]>
-rw-r--r--configs/sandbox_defconfig2
-rw-r--r--drivers/sm/Kconfig11
-rw-r--r--drivers/sm/Makefile4
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