diff mbox series

[2/2] optee: add RPMB dependency

Message ID 20240902151231.3705204-2-jens.wiklander@linaro.org (mailing list archive)
State New
Headers show
Series [1/2] mmc: block: add RPMB dependency | expand

Commit Message

Jens Wiklander Sept. 2, 2024, 3:12 p.m. UTC
Prevent build error when CONFIG_RPMB=m and CONFIG_OPTEE=y by adding a
dependency to CONFIG_RPMB for CONFIG_OPTEE so the RPMB subsystem always
is reachable if configured. This means that CONFIG_OPTEE automatically
becomes compiled as a module if CONFIG_RPMB is compiled as a module. If
CONFIG_RPMB isn't configured or is configured as built-in, CONFIG_OPTEE
will remain unchanged.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202409021448.RSvcBPzt-lkp@intel.com/
Fixes: f0c8431568ee ("optee: probe RPMB device using RPMB subsystem")
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
Replacing "rpmb: use IS_REACHABLE instead of IS_ENABLED"
https://lore.kernel.org/lkml/20240902080727.2665235-1-jens.wiklander@linaro.org/
---
 drivers/tee/optee/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Ulf Hansson Sept. 3, 2024, 12:37 p.m. UTC | #1
On Mon, 2 Sept 2024 at 17:12, Jens Wiklander <jens.wiklander@linaro.org> wrote:
>
> Prevent build error when CONFIG_RPMB=m and CONFIG_OPTEE=y by adding a
> dependency to CONFIG_RPMB for CONFIG_OPTEE so the RPMB subsystem always
> is reachable if configured. This means that CONFIG_OPTEE automatically
> becomes compiled as a module if CONFIG_RPMB is compiled as a module. If
> CONFIG_RPMB isn't configured or is configured as built-in, CONFIG_OPTEE
> will remain unchanged.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202409021448.RSvcBPzt-lkp@intel.com/
> Fixes: f0c8431568ee ("optee: probe RPMB device using RPMB subsystem")
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
> Replacing "rpmb: use IS_REACHABLE instead of IS_ENABLED"
> https://lore.kernel.org/lkml/20240902080727.2665235-1-jens.wiklander@linaro.org/
> ---
>  drivers/tee/optee/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig
> index 976928641aa6..7bb7990d0b07 100644
> --- a/drivers/tee/optee/Kconfig
> +++ b/drivers/tee/optee/Kconfig
> @@ -4,6 +4,7 @@ config OPTEE
>         tristate "OP-TEE"
>         depends on HAVE_ARM_SMCCC
>         depends on MMU
> +       depends on RPMB || !RPMB
>         help
>           This implements the OP-TEE Trusted Execution Environment (TEE)
>           driver.
> --
> 2.34.1
>
diff mbox series

Patch

diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig
index 976928641aa6..7bb7990d0b07 100644
--- a/drivers/tee/optee/Kconfig
+++ b/drivers/tee/optee/Kconfig
@@ -4,6 +4,7 @@  config OPTEE
 	tristate "OP-TEE"
 	depends on HAVE_ARM_SMCCC
 	depends on MMU
+	depends on RPMB || !RPMB
 	help
 	  This implements the OP-TEE Trusted Execution Environment (TEE)
 	  driver.