config: Move WiFi & BT toggles to Components menu, same as Ethernet

diff --git a/components/bt/Kconfig b/components/bt/Kconfig
index 204ccd1e5e86b7689e2c0690fb37838f35f52d67..d2227868cef71af60e1c3bd562df335b93d26127 100644 (file)
--- a/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@ -1,7 +1,7 @@
-menu "Bluetooth"
-
-config BT_ENABLED
-    bool "Enable Bluetooth stack"
+menuconfig BT_ENABLED
+    bool "Bluetooth"
+    help
+        Select this option to enable Bluetooth stack and show the submenu with Bluetooth configuration choices.
 
 config BTC_TASK_STACK_SIZE
        int "Bluetooth event (callback to application) task stack size"
@@ -17,8 +17,6 @@ config BLUEDROID_MEM_DEBUG
        help
                Bluedroid memory debug
 
-endmenu
-
 # Memory reserved at start of DRAM for Bluetooth stack
 config BT_RESERVE_DRAM
     hex

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index d07d0fe846c185ec547dfcad985f5a62e66a71a2..bc35ca0e8f64b1d039f4d3fa4744afdd49021062 100644 (file)
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -427,11 +427,11 @@ config ESP32_DEEP_SLEEP_WAKEUP_DELAY
 
 endmenu
 
-menu "WiFi"
-
-config WIFI_ENABLED
-    bool "Enable WiFi stack"
+menuconfig WIFI_ENABLED
+    bool "WiFi"
     default y
+    help
+       Select this option to enable WiFi stack and show the submenu with WiFi configuration choices.
 
 config SW_COEXIST_ENABLE
     bool "Software controls WiFi/Bluetooth coexistence"
@@ -492,5 +492,3 @@ config ESP32_WIFI_RX_BUFFER_NUM
         Set the number of WiFi rx buffers. Each buffer takes approximately 1.6KB of RAM.
         Larger number for higher throughput but more memory. Smaller number for lower
         throughput but less memory.
-
-endmenu
\ No newline at end of file

diff --git a/components/ethernet/Kconfig b/components/ethernet/Kconfig
index 9eb897cbba1b74fe766a7e8093586966720910a7..0ea94eaafd6679b54725eaca703e7be676b4ce4c 100644 (file)
--- a/components/ethernet/Kconfig
+++ b/components/ethernet/Kconfig
@@ -1,8 +1,8 @@
 menuconfig ETHERNET
-    bool "Enable Ethernet"
+    bool "Ethernet"
     default n
     help
-        Enable this option to enable ethernet driver and show the menu with ethernet features.
+        Select this option to enable ethernet driver and show the submenu with ethernet features.
 
 config DMA_RX_BUF_NUM
     int "DMA Rx Buf Num"