diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index d8c3f04d56..895085d383 100644
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -428,11 +428,16 @@ menu "Security features"
         select MBEDTLS_ECDSA_C
         depends on SECURE_SIGNED_ON_BOOT || SECURE_SIGNED_ON_UPDATE
 
+    config SECURE_ESP32_SUPPORTS_RSA
+        bool
+        default y if ESP32_REV_MIN_FULL >= 300
+        depends on IDF_TARGET_ESP32
+
     config SECURE_BOOT_SUPPORTS_RSA
         bool
         default y
         # RSA secure boot is supported in ESP32 revision >= v3.0
-        depends on (IDF_TARGET_ESP32 && ESP32_REV_MIN_FULL >= 300) || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 # NOERROR
+        depends on SECURE_ESP32_SUPPORTS_RSA || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 # NOERROR
 
     config SECURE_TARGET_HAS_SECURE_ROM_DL_MODE
         bool
diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 4189c16727..754ca607b8 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -61,12 +61,16 @@ menu "ESP32-specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32 Revision (Rev v3.99)"
+    choice ESP32_REV_MAX_FULL_STR
+        prompt "Maximum Supported ESP32 Revision"
+        config ESP32_REV_MAX_FULL_STR_OPT
+            bool "Rev v3.99"
+    endchoice
 
-        # Maximum revision that IDF supports.
-        # It can not be changed by user.
-        # Only Espressif can change it when a new version will be supported in IDF.
-        # Supports all chips starting from ESP32_REV_MIN_FULL to ESP32_REV_MAX_FULL
+    # Maximum revision that IDF supports.
+    # It can not be changed by user.
+    # Only Espressif can change it when a new version will be supported in IDF.
+    # Supports all chips starting from ESP32_REV_MIN_FULL to ESP32_REV_MAX_FULL
 
     config ESP32_REV_MAX_FULL
         int
diff --git a/components/esp32c3/Kconfig b/components/esp32c3/Kconfig
index 8e8783931c..a25bb5f415 100644
--- a/components/esp32c3/Kconfig
+++ b/components/esp32c3/Kconfig
@@ -71,12 +71,16 @@ menu "ESP32C3-Specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-C3 Revision (Rev v0.99)"
+    choice ESP32C3_REV_MAX_FULL_STR
+        prompt "Maximum Supported ESP32-C3 Revision"
+        config ESP32C3_REV_MAX_FULL_STR_OPT
+            bool "Rev v0.99"
+    endchoice
 
-        # Maximum revision that IDF supports.
-        # It can not be changed by user.
-        # Only Espressif can change it when a new version will be supported in IDF.
-        # Supports all chips starting from ESP32C3_REV_MIN_FULL to ESP32C3_REV_MAX_FULL
+    # Maximum revision that IDF supports.
+    # It can not be changed by user.
+    # Only Espressif can change it when a new version will be supported in IDF.
+    # Supports all chips starting from ESP32C3_REV_MIN_FULL to ESP32C3_REV_MAX_FULL
 
     config ESP32C3_REV_MAX_FULL
         int
diff --git a/components/esp32h2/Kconfig b/components/esp32h2/Kconfig
index f1d5b88b82..4aa50941fe 100644
--- a/components/esp32h2/Kconfig
+++ b/components/esp32h2/Kconfig
@@ -28,12 +28,16 @@ menu "ESP32H2-Specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-H2 Revision (Rev v0.99)"
+    choice ESP32H2_REV_MAX_FULL_STR
+        prompt "Maximum Supported ESP32-H2 Revision"
+        config ESP32H2_REV_MAX_FULL_STR_OPT
+            bool "Rev v0.99"
+    endchoice
 
-        # Maximum revision that IDF supports.
-        # It can not be changed by user.
-        # Only Espressif can change it when a new version will be supported in IDF.
-        # Supports all chips starting from ESP32H2_REV_MIN_FULL to ESP32H2_REV_MAX_FULL
+    # Maximum revision that IDF supports.
+    # It can not be changed by user.
+    # Only Espressif can change it when a new version will be supported in IDF.
+    # Supports all chips starting from ESP32H2_REV_MIN_FULL to ESP32H2_REV_MAX_FULL
 
     config ESP32H2_REV_MAX_FULL
         int
diff --git a/components/esp32s2/Kconfig b/components/esp32s2/Kconfig
index 88b8d9d11b..d4941a24a7 100644
--- a/components/esp32s2/Kconfig
+++ b/components/esp32s2/Kconfig
@@ -34,12 +34,16 @@ menu "ESP32S2-specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-S2 Revision (Rev v1.99)"
+    choice ESP32S2_REV_MAX_FULL_STR
+        prompt "Maximum Supported ESP32-S2 Revision"
+        config ESP32S2_REV_MAX_FULL_STR_OPT
+            bool "Rev v1.99"
+    endchoice
 
-        # Maximum revision that IDF supports.
-        # It can not be changed by user.
-        # Only Espressif can change it when a new version will be supported in IDF.
-        # Supports all chips starting from ESP32S2_REV_MIN_FULL to ESP32S2_REV_MAX_FULL
+    # Maximum revision that IDF supports.
+    # It can not be changed by user.
+    # Only Espressif can change it when a new version will be supported in IDF.
+    # Supports all chips starting from ESP32S2_REV_MIN_FULL to ESP32S2_REV_MAX_FULL
 
     config ESP32S2_REV_MAX_FULL
         int
diff --git a/components/esp32s3/Kconfig b/components/esp32s3/Kconfig
index 9887723db0..b20ca6c417 100644
--- a/components/esp32s3/Kconfig
+++ b/components/esp32s3/Kconfig
@@ -34,12 +34,16 @@ menu "ESP32S3-Specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-S3 Revision (Rev v0.99)"
+    choice ESP32S3_REV_MAX_FULL_STR
+        prompt "Maximum Supported ESP32-S3 Revision"
+        config ESP32S3_REV_MAX_FULL_STR_OPT
+            bool "Rev v0.99"
+    endchoice
 
-        # Maximum revision that IDF supports.
-        # It can not be changed by user.
-        # Only Espressif can change it when a new version will be supported in IDF.
-        # Supports all chips starting from ESP32S3_REV_MIN_FULL to ESP32S3_REV_MAX_FULL
+    # Maximum revision that IDF supports.
+    # It can not be changed by user.
+    # Only Espressif can change it when a new version will be supported in IDF.
+    # Supports all chips starting from ESP32S3_REV_MIN_FULL to ESP32S3_REV_MAX_FULL
 
     config ESP32S3_REV_MAX_FULL
         int