diff --git a/arch/risc-v/src/esp32c3/Kconfig b/arch/risc-v/src/esp32c3/Kconfig
index e07d1e00fc3..93056580fa8 100644
--- a/arch/risc-v/src/esp32c3/Kconfig
+++ b/arch/risc-v/src/esp32c3/Kconfig
@@ -736,13 +736,13 @@ config ESP32C3_WIFI_SAVE_PARAM
 		into the file system instead of computing them each time.
 
 		These parameters mainly contains:
-		  - SSID
-		  - Password
-		  - BSSID
-		  - PMK(compute when connecting)
-		  - Author mode
-		  - MAC address
-		  - Wi-Fi hardware configuration parameters
+			- SSID
+			- Password
+			- BSSID
+			- PMK(compute when connecting)
+			- Author mode
+			- MAC address
+			- Wi-Fi hardware configuration parameters
 
 config ESP32C3_WIFI_FS_MOUNTPT
 	string "Wi-Fi parameters mount point"
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index edb52ffc053..f2a3e4b5a94 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -212,9 +212,9 @@ config ESP32_XTAL_26MHz
 endchoice # On-board Crystal Frequency
 
 choice ESP32_RTC_CLK_SRC
-    prompt "RTC clock source"
-    default ESP32_RTC_CLK_SRC_INT_RC
-    ---help---
+	prompt "RTC clock source"
+	default ESP32_RTC_CLK_SRC_INT_RC
+	---help---
 		Choose which clock is used as RTC clock source.
 
 		- "Internal 150kHz oscillator" option provides lowest deep sleep current
diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig
index 4c20c74ea5a..0343984f311 100644
--- a/arch/xtensa/src/esp32s2/Kconfig
+++ b/arch/xtensa/src/esp32s2/Kconfig
@@ -180,7 +180,7 @@ config ESP32S2_RUN_IRAM
 	bool "Run from IRAM"
 	default n
 	---help---
-		This loads all of NuttX inside IRAM.  Used to test somewhat small
+		This loads all of NuttX inside IRAM. Used to test somewhat small
 		images that can fit entirely in IRAM.
 
 menu "ESP32-S2 Peripheral Selection"
@@ -703,7 +703,7 @@ choice ESP32S2_SPIRAM_SPEED
 	prompt "Set RAM clock speed"
 	default ESP32S2_SPIRAM_SPEED_40M
 	---help---
-	    Select the speed for the SPI RAM chip.
+		Select the speed for the SPI RAM chip.
 
 config ESP32S2_SPIRAM_SPEED_40M
 	bool "40MHz clock speed"
@@ -718,33 +718,33 @@ config ESP32S2_SPIRAM_BOOT_INIT
 	depends on ESP32S2_SPIRAM
 	default "y"
 	---help---
-	    If this is enabled, the SPI RAM will be enabled during initial
-	    boot. Unless you have specific requirements, you'll want to leave
-	    this enabled so memory allocated during boot-up can also be
-	    placed in SPI RAM.
+		If this is enabled, the SPI RAM will be enabled during initial
+		boot. Unless you have specific requirements, you'll want to leave
+		this enabled so memory allocated during boot-up can also be
+		placed in SPI RAM.
 
 config ESP32S2_SPIRAM_IGNORE_NOTFOUND
 	bool "Ignore PSRAM when not found"
 	default "n"
 	depends on ESP32S2_SPIRAM_BOOT_INIT && !BOOT_SDRAM_DATA
 	---help---
-	    Normally, if psram initialization is enabled during compile time
-	    but not found at runtime, it is seen as an error making the CPU
-	    panic. If this is enabled, booting will complete but no PSRAM
-	    will be available.
+		Normally, if psram initialization is enabled during compile time
+		but not found at runtime, it is seen as an error making the CPU
+		panic. If this is enabled, booting will complete but no PSRAM
+		will be available.
 
 config ESP32S2_SPIRAM_2T_MODE
 	bool "Enable SPI PSRAM 2T mode"
 	depends on ESP32S2_SPIRAM
 	default "n"
 	---help---
-	    Enable this option to fix single bit errors inside 64Mbit PSRAM.
-	    Some 64Mbit PSRAM chips have a hardware issue in the RAM which
-	    causes bit errors at multiple fixed bit positions.
-	    Note: If this option is enabled, the 64Mbit PSRAM chip will appear
-	    to be 32Mbit in size.
-	    Applications will not be affected unless the use the esp_himem
-	    APIs, which are not supported in 2T mode.
+		Enable this option to fix single bit errors inside 64Mbit PSRAM.
+		Some 64Mbit PSRAM chips have a hardware issue in the RAM which
+		causes bit errors at multiple fixed bit positions.
+		Note: If this option is enabled, the 64Mbit PSRAM chip will appear
+		to be 32Mbit in size.
+		Applications will not be affected unless the use the esp_himem
+		APIs, which are not supported in 2T mode.
 
 config ESP32S2_SPIRAM_BANKSWITCH_ENABLE
 	bool "Enable bank switching for >4MiB external RAM"
@@ -845,13 +845,13 @@ config ESP32S2_WIFI_SAVE_PARAM
 		into the file system instead of computing them each time.
 
 		These parameters mainly contains:
-		  - SSID
-		  - Password
-		  - BSSID
-		  - PMK(compute when connecting)
-		  - Author mode
-		  - MAC address
-		  - Wi-Fi hardware configuration parameters
+			- SSID
+			- Password
+			- BSSID
+			- PMK(compute when connecting)
+			- Author mode
+			- MAC address
+			- Wi-Fi hardware configuration parameters
 
 config ESP32S2_WIFI_FS_MOUNTPT
 	string "Wi-Fi parameters mount point"