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>

diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
index 9488fc040acddb673aceb96d6c762bd6c8bcbf68..7d7e7f469ab47c89202a7e47da7f39686c723e36 100644 (file)
--- a/configs/evb-px30_defconfig
+++ b/configs/evb-px30_defconfig
@@ -68,6 +68,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
 CONFIG_ROCKCHIP_OTP=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PHY_REALTEK=y

diff --git a/configs/evb-rk3308_defconfig b/configs/evb-rk3308_defconfig
index 3194a2bb62dd904b901429d50b6526f9545fa001..a3a319f4c247a8a9107c8d5151d758b6dea5b979 100644 (file)
--- a/configs/evb-rk3308_defconfig
+++ b/configs/evb-rk3308_defconfig
@@ -49,6 +49,7 @@ CONFIG_CLK=y
 # CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_DM_ETH=y

diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
index 7453ccf1274f4204c572e471ae5eb1e3049d4899..5975d250aa3c3c7e610eabaf7b7845668cc4ff12 100644 (file)
--- a/configs/evb-rk3568_defconfig
+++ b/configs/evb-rk3568_defconfig
@@ -20,6 +20,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y

diff --git a/configs/firefly-px30_defconfig b/configs/firefly-px30_defconfig
index 7207028403bd8a0f274f7f75addc16c07e805963..0a84ccef2678bb8f5298bb84a17f8e995486ac20 100644 (file)
--- a/configs/firefly-px30_defconfig
+++ b/configs/firefly-px30_defconfig
@@ -69,6 +69,7 @@ CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
 CONFIG_ROCKCHIP_OTP=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_PHY_REALTEK=y

diff --git a/configs/octeontx2_95xx_defconfig b/configs/octeontx2_95xx_defconfig
index 8fe622cc012fee06febe4d5acd2c61f73d8b6d9d..d29c850518df3d489ce69bbb464883581fc1452c 100644 (file)
--- a/configs/octeontx2_95xx_defconfig
+++ b/configs/octeontx2_95xx_defconfig
@@ -72,6 +72,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_TFTP_TSIZE=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_OCTEONTX=y

diff --git a/configs/octeontx2_96xx_defconfig b/configs/octeontx2_96xx_defconfig
index bee6730bc178a37021b098de23360a3a8680ed0d..1298bfe3092e224c366391d6471dd30f637fd6c7 100644 (file)
--- a/configs/octeontx2_96xx_defconfig
+++ b/configs/octeontx2_96xx_defconfig
@@ -78,6 +78,7 @@ CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_HS400_SUPPORT=y
 CONFIG_MMC_OCTEONTX=y

diff --git a/configs/octeontx_81xx_defconfig b/configs/octeontx_81xx_defconfig
index 0238f2f2b788346c0595d382152a71a8db8ecc80..ba8cc97ab87c885ee840dcb92b893c2582f0f15d 100644 (file)
--- a/configs/octeontx_81xx_defconfig
+++ b/configs/octeontx_81xx_defconfig
@@ -75,6 +75,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y

diff --git a/configs/octeontx_83xx_defconfig b/configs/octeontx_83xx_defconfig
index 4cfd4eae614ed9fe10580aa495d0f67d3200989f..26759341c518d4f36303cc84b68ad618c7b2e064 100644 (file)
--- a/configs/octeontx_83xx_defconfig
+++ b/configs/octeontx_83xx_defconfig
@@ -72,6 +72,7 @@ CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OCTEONTX=y
 CONFIG_MTD=y

diff --git a/configs/roc-cc-rk3308_defconfig b/configs/roc-cc-rk3308_defconfig
index c867cff4b271b3339979d6222657650a87c018da..94492648f553fdb6d5aa22ff32d6de6e8b17ecc0 100644 (file)
--- a/configs/roc-cc-rk3308_defconfig
+++ b/configs/roc-cc-rk3308_defconfig
@@ -49,6 +49,7 @@ CONFIG_CLK=y
 # CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_DM_ETH=y

diff --git a/include/configs/evb_px30.h b/include/configs/evb_px30.h
index 27201fcfd7cb1cf8e4d5fb6c9fb9a9980fe67229..53781ba7ae8a98f6c52042b02426c63216807fc9 100644 (file)
--- a/include/configs/evb_px30.h
+++ b/include/configs/evb_px30.h
@@ -12,6 +12,4 @@
                "stdout=serial,vidconsole\0" \
                "stderr=serial,vidconsole\0"
 
-#define CONFIG_SUPPORT_EMMC_RPMB
-
 #endif

diff --git a/include/configs/evb_rk3308.h b/include/configs/evb_rk3308.h
index e8893eb7de85c6ee0171d57a8eef91922243fc5e..0273e751ce67847ce4b4b29b895de3b84ebccaf1 100644 (file)
--- a/include/configs/evb_rk3308.h
+++ b/include/configs/evb_rk3308.h
@@ -8,8 +8,6 @@
 
 #include <configs/rk3308_common.h>
 
-#define CONFIG_SUPPORT_EMMC_RPMB
-
 #define ROCKCHIP_DEVICE_SETTINGS \
                        "stdout=serial,vidconsole\0" \
                        "stderr=serial,vidconsole\0"

diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h
index 2b255a11da2e1ba036c0968d8146b6d2928846e6..a0f2383bf2f282e3e49b5413a30c3f97462c20bd 100644 (file)
--- a/include/configs/evb_rk3568.h
+++ b/include/configs/evb_rk3568.h
@@ -8,8 +8,6 @@
 
 #include <configs/rk3568_common.h>
 
-#define CONFIG_SUPPORT_EMMC_RPMB
-
 #define ROCKCHIP_DEVICE_SETTINGS \
                        "stdout=serial,vidconsole\0" \
                        "stderr=serial,vidconsole\0"

diff --git a/include/configs/firefly_rk3308.h b/include/configs/firefly_rk3308.h
index 3af24930431e82277af2e3dc4de1d6cd45a43927..28e3a547e337dff9598193b9928f0d016103ff05 100644 (file)
--- a/include/configs/firefly_rk3308.h
+++ b/include/configs/firefly_rk3308.h
@@ -8,8 +8,6 @@
 
 #include <configs/rk3308_common.h>
 
-#define CONFIG_SUPPORT_EMMC_RPMB
-
 #define ROCKCHIP_DEVICE_SETTINGS \
                        "stdout=serial,vidconsole\0" \
                        "stderr=serial,vidconsole\0"

diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h
index 620bf884c52713a041965d3f1d9be4144ea85744..536dff2bdfd0e8f6aef4f47d8a50981a08823ef5 100644 (file)
--- a/include/configs/octeontx2_common.h
+++ b/include/configs/octeontx2_common.h
@@ -41,7 +41,6 @@
 #if defined(CONFIG_MMC_OCTEONTX)
 #define MMC_SUPPORTS_TUNING
 /** EMMC specific defines */
-#define CONFIG_SUPPORT_EMMC_RPMB
 #endif
 
 #endif /* __OCTEONTX2_COMMON_H__ */

diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index 39e0d19cb74a30e52f46e3a0226efc1a4b188f03..8185f4b6250f71b69976eb3b6346cc0974cc4b6f 100644 (file)
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -70,9 +70,6 @@
 #define CONFIG_SYS_MMC_MAX_BLK_COUNT   8192
 
 /** EMMC specific defines */
-#if defined(CONFIG_MMC_OCTEONTX)
-#define CONFIG_SUPPORT_EMMC_RPMB
-#endif
 
 #if defined(CONFIG_NAND_OCTEONTX)
 /*#define CONFIG_MTD_CONCAT */