Convert CONFIG_SUPPORT_EMMC_RPMB to Kconfig

This converts the following to Kconfig:
   CONFIG_SUPPORT_EMMC_RPMB

This fixes a few platforms where the option was not taking effect as
intended.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-12-11 14:55:53 -05:00
parent de35b8f9c5
commit d5bfef2fcd
15 changed files with 9 additions and 12 deletions

View File

@ -68,6 +68,7 @@ CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_ROCKCHIP_OTP=y CONFIG_ROCKCHIP_OTP=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y

View File

@ -49,6 +49,7 @@ CONFIG_CLK=y
# CONFIG_USB_FUNCTION_FASTBOOT is not set # CONFIG_USB_FUNCTION_FASTBOOT is not set
CONFIG_ROCKCHIP_GPIO=y CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y

View File

@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_ROCKCHIP_GPIO=y CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y

View File

@ -69,6 +69,7 @@ CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_ROCKCHIP_OTP=y CONFIG_ROCKCHIP_OTP=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_PHY_REALTEK=y CONFIG_PHY_REALTEK=y

View File

@ -72,6 +72,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_TFTP_TSIZE=y CONFIG_TFTP_TSIZE=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y
CONFIG_MMC_OCTEONTX=y CONFIG_MMC_OCTEONTX=y

View File

@ -78,6 +78,7 @@ CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
CONFIG_I2C_MUX=y CONFIG_I2C_MUX=y
CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX_PCA954x=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_HS400_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y
CONFIG_MMC_OCTEONTX=y CONFIG_MMC_OCTEONTX=y

View File

@ -75,6 +75,7 @@ CONFIG_SCSI_AHCI=y
CONFIG_AHCI_PCI=y CONFIG_AHCI_PCI=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OCTEONTX=y CONFIG_MMC_OCTEONTX=y
CONFIG_MTD=y CONFIG_MTD=y

View File

@ -72,6 +72,7 @@ CONFIG_SCSI_AHCI=y
CONFIG_AHCI_PCI=y CONFIG_AHCI_PCI=y
CONFIG_DM_I2C=y CONFIG_DM_I2C=y
CONFIG_MISC=y CONFIG_MISC=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_MMC_OCTEONTX=y CONFIG_MMC_OCTEONTX=y
CONFIG_MTD=y CONFIG_MTD=y

View File

@ -49,6 +49,7 @@ CONFIG_CLK=y
# CONFIG_USB_FUNCTION_FASTBOOT is not set # CONFIG_USB_FUNCTION_FASTBOOT is not set
CONFIG_ROCKCHIP_GPIO=y CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_MMC_DW=y CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y

View File

@ -12,6 +12,4 @@
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0" "stderr=serial,vidconsole\0"
#define CONFIG_SUPPORT_EMMC_RPMB
#endif #endif

View File

@ -8,8 +8,6 @@
#include <configs/rk3308_common.h> #include <configs/rk3308_common.h>
#define CONFIG_SUPPORT_EMMC_RPMB
#define ROCKCHIP_DEVICE_SETTINGS \ #define ROCKCHIP_DEVICE_SETTINGS \
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0" "stderr=serial,vidconsole\0"

View File

@ -8,8 +8,6 @@
#include <configs/rk3568_common.h> #include <configs/rk3568_common.h>
#define CONFIG_SUPPORT_EMMC_RPMB
#define ROCKCHIP_DEVICE_SETTINGS \ #define ROCKCHIP_DEVICE_SETTINGS \
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0" "stderr=serial,vidconsole\0"

View File

@ -8,8 +8,6 @@
#include <configs/rk3308_common.h> #include <configs/rk3308_common.h>
#define CONFIG_SUPPORT_EMMC_RPMB
#define ROCKCHIP_DEVICE_SETTINGS \ #define ROCKCHIP_DEVICE_SETTINGS \
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0" "stderr=serial,vidconsole\0"

View File

@ -41,7 +41,6 @@
#if defined(CONFIG_MMC_OCTEONTX) #if defined(CONFIG_MMC_OCTEONTX)
#define MMC_SUPPORTS_TUNING #define MMC_SUPPORTS_TUNING
/** EMMC specific defines */ /** EMMC specific defines */
#define CONFIG_SUPPORT_EMMC_RPMB
#endif #endif
#endif /* __OCTEONTX2_COMMON_H__ */ #endif /* __OCTEONTX2_COMMON_H__ */

View File

@ -70,9 +70,6 @@
#define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192 #define CONFIG_SYS_MMC_MAX_BLK_COUNT 8192
/** EMMC specific defines */ /** EMMC specific defines */
#if defined(CONFIG_MMC_OCTEONTX)
#define CONFIG_SUPPORT_EMMC_RPMB
#endif
#if defined(CONFIG_NAND_OCTEONTX) #if defined(CONFIG_NAND_OCTEONTX)
/*#define CONFIG_MTD_CONCAT */ /*#define CONFIG_MTD_CONCAT */