[PATCH] sm: Rework the Kconfig logic here

[Tom Rini]

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.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 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 0c030f4a7925..3ae198e448aa 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -320,7 +320,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 926af2863308..8e500ed2ede5 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 da81ee898abf..5ac947350bde 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.43.0