]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
optee: add RPMB dependency
authorJens Wiklander <jens.wiklander@linaro.org>
Mon, 2 Sep 2024 15:12:31 +0000 (17:12 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 3 Sep 2024 12:34:45 +0000 (14:34 +0200)
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>
Link: https://lore.kernel.org/r/20240902151231.3705204-2-jens.wiklander@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/tee/optee/Kconfig

index 976928641aa64ed5aaf867084a1fcc9c2b0b0129..7bb7990d0b074e24de36369b5b12084749a2eafc 100644 (file)
@@ -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.