From 017aa5acd6166924293c92537f1453a579926a03 Mon Sep 17 00:00:00 2001
From: KonstantinKondrashov <konstantin@espressif.com>
Date: Sat, 25 Feb 2023 16:27:42 +0800
Subject: [PATCH] kconfigs: Fix config issues raised by gen_kconfig_doc.py

---
 components/bootloader/Kconfig.projbuild |  7 ++++++-
 components/esp32/Kconfig                | 15 ++++++++++-----
 components/esp32c3/Kconfig              | 15 ++++++++++-----
 components/esp32s2/Kconfig              | 15 ++++++++++-----
 components/esp32s3/Kconfig              | 15 ++++++++++-----
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/components/bootloader/Kconfig.projbuild b/components/bootloader/Kconfig.projbuild
index 260514efcf..9489f1d7ea 100644
--- a/components/bootloader/Kconfig.projbuild
+++ b/components/bootloader/Kconfig.projbuild
@@ -400,11 +400,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
+        depends on SECURE_ESP32_SUPPORTS_RSA || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3
 
     config SECURE_TARGET_HAS_SECURE_ROM_DL_MODE
         bool
diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index b63f20e2b0..adbf222a05 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -61,11 +61,16 @@ menu "ESP32-specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32 Revision (Rev v3.99)"
-        # 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
+    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
 
     config ESP32_REV_MAX_FULL
         int
diff --git a/components/esp32c3/Kconfig b/components/esp32c3/Kconfig
index 9d24b97d3b..344fc7b9e4 100644
--- a/components/esp32c3/Kconfig
+++ b/components/esp32c3/Kconfig
@@ -71,11 +71,16 @@ menu "ESP32C3-Specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-C3 Revision (Rev v0.99)"
-        # 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
+    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
 
     config ESP32C3_REV_MAX_FULL
         int
diff --git a/components/esp32s2/Kconfig b/components/esp32s2/Kconfig
index 922b7996ea..0fdf434739 100644
--- a/components/esp32s2/Kconfig
+++ b/components/esp32s2/Kconfig
@@ -34,11 +34,16 @@ menu "ESP32S2-specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-S2 Revision (Rev v1.99)"
-        # 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
+    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
 
     config ESP32S2_REV_MAX_FULL
         int
diff --git a/components/esp32s3/Kconfig b/components/esp32s3/Kconfig
index e9d64fc3b3..4117df7ace 100644
--- a/components/esp32s3/Kconfig
+++ b/components/esp32s3/Kconfig
@@ -34,11 +34,16 @@ menu "ESP32S3-Specific"
         # MAX Revision
         #
 
-        comment "Maximum Supported ESP32-S3 Revision (Rev v0.99)"
-        # 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
+    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
 
     config ESP32S3_REV_MAX_FULL
         int