From b2b4cbadf378c1b72ce7da31457673d298a3584f Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Tue, 11 May 2021 10:00:49 +0800 Subject: [PATCH] MA-19026 Add config to guard rpmb driver in SPL Android will need rpmb operation in SPL, below commit guard the rpmb.c build with CONFIG_SPL_SUPPORT_EMMC_RPMB but didn't add it in the Kconfig: commit 2448c34f9fc26d3c459e6e7b28c6357656bfa287 Author: Heinrich Schuchardt Date: Wed Apr 15 18:28:09 2020 +0200 drivers: mmc: rpmb: do not build for SPL RPMB support is used by the 'mmc rpmb' command and by the OP-TEE support. We do not need it in SPL. This commit will add CONFIG_SPL_SUPPORT_EMMC_RPMB defination and select it by default when trusty is enabled. Change-Id: I8d3b4481d529828cb03328b826e0e7065104ba46 Signed-off-by: Ji Luo --- arch/arm/mach-imx/Kconfig | 1 + drivers/mmc/Kconfig | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index d46437a766..9cf5b414ba 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -292,6 +292,7 @@ config IMX_TRUSTY_OS select SYS_ARM_CACHE_WRITEALLOC select CMD_MMC_RPMB select SUPPORT_EMMC_RPMB + select SPL_SUPPORT_EMMC_RPMB config TRUSTY_UNLOCK_PERMISSION bool "Support unlock permission protection in trusty" diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f8ca52efb6..a1d39d9328 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -105,6 +105,14 @@ config SUPPORT_EMMC_RPMB Enable support for reading, writing and programming the key for the Replay Protection Memory Block partition in eMMC. +config SPL_SUPPORT_EMMC_RPMB + bool "Support eMMC replay protected memory block (RPMB) in SPL" + default n + imply CMD_MMC_RPMB + help + Enable support for reading, writing and programming the + key for the Replay Protection Memory Block partition in eMMC. + config SUPPORT_EMMC_BOOT bool "Support some additional features of the eMMC boot partitions" help -- 2.17.1