[PATCH 8/9] Convert CONFIG_SUPPORT_EMMC_RPMB to Kconfig

Tom Rini trini at konsulko.com
Sat Dec 11 20:55:53 CET 2021 

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 at konsulko.com>
---
 configs/evb-px30_defconfig         | 1 +
 configs/evb-rk3308_defconfig       | 1 +
 configs/evb-rk3568_defconfig       | 1 +
 configs/firefly-px30_defconfig     | 1 +
 configs/octeontx2_95xx_defconfig   | 1 +
 configs/octeontx2_96xx_defconfig   | 1 +
 configs/octeontx_81xx_defconfig    | 1 +
 configs/octeontx_83xx_defconfig    | 1 +
 configs/roc-cc-rk3308_defconfig    | 1 +
 include/configs/evb_px30.h         | 2 --
 include/configs/evb_rk3308.h       | 2 --
 include/configs/evb_rk3568.h       | 2 --
 include/configs/firefly_rk3308.h   | 2 --
 include/configs/octeontx2_common.h | 1 -
 include/configs/octeontx_common.h  | 3 ---
 15 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/configs/evb-px30_defconfig b/configs/evb-px30_defconfig
index 9488fc040acd..7d7e7f469ab4 100644
--- 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 3194a2bb62dd..a3a319f4c247 100644
--- 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 7453ccf1274f..5975d250aa3c 100644
--- 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 7207028403bd..0a84ccef2678 100644
--- 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 02121c8b4cf5..3ebadc08e4af 100644
--- 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 22c6c37c04e9..d5ce7f66e765 100644
--- 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 a516a6ffd585..270dfc5034aa 100644
--- 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 458832052e3c..0f50d4f8da76 100644
--- 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 c867cff4b271..94492648f553 100644
--- 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 27201fcfd7cb..53781ba7ae8a 100644
--- 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 e8893eb7de85..0273e751ce67 100644
--- 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 2b255a11da2e..a0f2383bf2f2 100644
--- 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 3af24930431e..28e3a547e337 100644
--- 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 620bf884c527..536dff2bdfd0 100644
--- 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 39e0d19cb74a..8185f4b6250f 100644
--- 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 */
-- 
2.25.1

More information about the U-Boot mailing list