diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 07e85540ff9..cc30c93afb9 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -690,7 +690,7 @@ config USART0_RS485MODE
 		Enable RS-485 interface on USART0.
 
 if USART0_RS485_MODE
-	config USART0_RS485DIROIN
+config USART0_RS485DIROIN
 	bool "Invert direction control pin polarity"
 	default n
 	---help---
@@ -698,7 +698,7 @@ if USART0_RS485_MODE
 		transmitter has data to be sent.  It will be driven to logic 1 after
 		the last bit of data has been transmitted.
 
-endif # USART0_RS485MODE
+endif # USART0_RS485_MODE
 
 endif # LPC43_USART0
 
@@ -727,7 +727,7 @@ config USART2_RS485MODE
 		Enable RS-485 interface on USART2.
 
 if USART2_RS485MODE
-	config USART0_RS485DIROIN
+config USART0_RS485DIROIN
 	bool "Invert direction control pin polarity"
 	default n
 	---help---
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index 87d52336083..d67e905c60b 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -814,7 +814,8 @@ config SAM34_EXTNANDSIZE
 	default 0
 	---help---
 		Size of the external NAND in bytes.
-	config SAM34_HAVE_NAND
+
+config SAM34_HAVE_NAND
 	bool
 	default n
 
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index 52e20dc9bd9..d225162f2b2 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -1246,7 +1246,7 @@ config SAMA5D2_CLASSD_MONOMODE_SAT
 config SAMA5D2_CLASSD_MONOMODE_LEFT
 	bool "L       -> both channels"
 
-	config SAMA5D2_CLASSD_MONOMODE_RIGHT
+config SAMA5D2_CLASSD_MONOMODE_RIGHT
 	bool "R       -> both channels"
 
 endchoice # Mono Mode Selection (MONOMODE)
diff --git a/arch/risc-v/src/esp32c3/Kconfig b/arch/risc-v/src/esp32c3/Kconfig
index 5465188628c..354187bcdf7 100644
--- a/arch/risc-v/src/esp32c3/Kconfig
+++ b/arch/risc-v/src/esp32c3/Kconfig
@@ -801,12 +801,15 @@ choice EXAMPLE_POWER_SAVE_MODE
 		may be lost because station may be in sleep state at DTIM time. If listen interval is longer, more power
 		is saved but broadcast data is more easy to lose.
 
-	config EXAMPLE_POWER_SAVE_NONE
-		bool "none"
-	config EXAMPLE_POWER_SAVE_MIN_MODEM
-		bool "minimum modem"
-	config EXAMPLE_POWER_SAVE_MAX_MODEM
-		bool "maximum modem"
+config EXAMPLE_POWER_SAVE_NONE
+	bool "none"
+
+config EXAMPLE_POWER_SAVE_MIN_MODEM
+	bool "minimum modem"
+
+config EXAMPLE_POWER_SAVE_MAX_MODEM
+	bool "maximum modem"
+
 endchoice
 
 config ESP32C3_WIFI_RECONNECT
@@ -822,18 +825,24 @@ choice ESP32C3_WIFI_LOG_LEVEL
 	---help---
 		The WiFi log is divided into the following levels: ERROR,WARNING,INFO,DEBUG,VERBOSE.
 
-	config WIFI_LOG_LEVEL_NONE
-		bool "No output"
-	config WIFI_LOG_LEVEL_ERROR
-		bool "Error"
-	config WIFI_LOG_LEVEL_WARN
-		bool "Warning"
-	config WIFI_LOG_LEVEL_INFO
-		bool "Info"
-	config WIFI_LOG_LEVEL_DEBUG
-		bool "Debug"
-	config WIFI_LOG_LEVEL_VERBOSE
-		bool "Verbose"
+config WIFI_LOG_LEVEL_NONE
+	bool "No output"
+
+config WIFI_LOG_LEVEL_ERROR
+	bool "Error"
+
+config WIFI_LOG_LEVEL_WARN
+	bool "Warning"
+
+config WIFI_LOG_LEVEL_INFO
+	bool "Info"
+
+config WIFI_LOG_LEVEL_DEBUG
+	bool "Debug"
+
+config WIFI_LOG_LEVEL_VERBOSE
+	bool "Verbose"
+
 endchoice
 
 config WIFI_LOG_LEVEL
@@ -1136,23 +1145,24 @@ choice ESP32C3_BROWNOUT_DET_LVL_SEL
 		#The voltage levels here are estimates, more work needs to be done to figure out the exact voltages
 		#of the brownout threshold levels.
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_7
-		bool "2.51V"
+config ESP32C3_BROWNOUT_DET_LVL_SEL_7
+	bool "2.51V"
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_6
-		bool "2.64V"
+config ESP32C3_BROWNOUT_DET_LVL_SEL_6
+	bool "2.64V"
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_5
-		bool "2.76V"
+config ESP32C3_BROWNOUT_DET_LVL_SEL_5
+	bool "2.76V"
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_4
-		bool "2.92V"
+config ESP32C3_BROWNOUT_DET_LVL_SEL_4
+	bool "2.92V"
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_3
-		bool "3.10V"
+config ESP32C3_BROWNOUT_DET_LVL_SEL_3
+	bool "3.10V"
+
+config ESP32C3_BROWNOUT_DET_LVL_SEL_2
+	bool "3.27V"
 
-	config ESP32C3_BROWNOUT_DET_LVL_SEL_2
-		bool "3.27V"
 endchoice
 
 config ESP32C3_BROWNOUT_DET_LVL
diff --git a/arch/risc-v/src/espressif/Kconfig b/arch/risc-v/src/espressif/Kconfig
index c431196fcd4..dfd0c2ed14f 100644
--- a/arch/risc-v/src/espressif/Kconfig
+++ b/arch/risc-v/src/espressif/Kconfig
@@ -403,24 +403,25 @@ choice ESPRESSIF_BROWNOUT_DET_LVL_SEL
 		approximately below this level. Note that there may be some variation
 		of brownout voltage level between each chip.
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_7
-		bool "2.51V"
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_7
+	bool "2.51V"
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_6
-		bool "2.64V"
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_6
+	bool "2.64V"
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_5
-		bool "2.76V"
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_5
+	bool "2.76V"
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_4
-		bool "2.92V"
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_4
+	bool "2.92V"
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_3
-		bool "3.10V"
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_3
+	bool "3.10V"
 
-	config ESPRESSIF_BROWNOUT_DET_LVL_SEL_2
-		bool "3.27V"
-endchoice
+config ESPRESSIF_BROWNOUT_DET_LVL_SEL_2
+	bool "3.27V"
+
+endchoice # ESPRESSIF_BROWNOUT_DET_LVL_SEL
 
 config ESPRESSIF_BROWNOUT_DET_LVL
 	int
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index a92c4d89349..a9be4261a67 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -780,15 +780,15 @@ choice ESP32_SPIRAM_HEAP
 	---help---
 		Select how the SPI RAM will be used as heap.
 
-	config ESP32_SPIRAM_COMMON_HEAP
-		bool "Additional region to kernel heap"
+config ESP32_SPIRAM_COMMON_HEAP
+	bool "Additional region to kernel heap"
 
-	config ESP32_SPIRAM_USER_HEAP
-		bool "Separated userspace heap"
-		select MM_KERNEL_HEAP
-		select ESP32_USER_DATA_EXTMEM if BUILD_PROTECTED
+config ESP32_SPIRAM_USER_HEAP
+	bool "Separated userspace heap"
+	select MM_KERNEL_HEAP
+	select ESP32_USER_DATA_EXTMEM if BUILD_PROTECTED
 
-endchoice
+endchoice # ESP32_SPIRAM_HEAP
 
 config ESP32_IMM_HEAP
 	bool "Reserve part of DRAM as a separate heap"
@@ -2088,13 +2088,16 @@ choice EXAMPLE_POWER_SAVE_MODE
 		may be lost because station may be in sleep state at DTIM time. If listen interval is longer, more power
 		is saved but broadcast data is more easy to lose.
 
-	config EXAMPLE_POWER_SAVE_NONE
-		bool "none"
-	config EXAMPLE_POWER_SAVE_MIN_MODEM
-		bool "minimum modem"
-	config EXAMPLE_POWER_SAVE_MAX_MODEM
-		bool "maximum modem"
-endchoice
+config EXAMPLE_POWER_SAVE_NONE
+	bool "none"
+	
+config EXAMPLE_POWER_SAVE_MIN_MODEM
+	bool "minimum modem"
+
+config EXAMPLE_POWER_SAVE_MAX_MODEM
+	bool "maximum modem"
+
+endchoice # EXAMPLE_POWER_SAVE_MODE
 
 config ESP32_WIFI_WLAN_BUFFER_OPTIMIZATION
 	bool "Enable optimization of WLAN driver buffer"
diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig
index ce11cebf89d..f3fc318590f 100644
--- a/arch/xtensa/src/esp32s2/Kconfig
+++ b/arch/xtensa/src/esp32s2/Kconfig
@@ -77,12 +77,12 @@ choice ESP32S2_INSTRUCTION_CACHE_LINE_SIZE
 	---help---
 		Instruction cache line size to be set on application startup.
 
-	config ESP32S2_INSTRUCTION_CACHE_LINE_16B
-		bool "16 Bytes"
-		depends on ESP32S2_INSTRUCTION_CACHE_16KB
+config ESP32S2_INSTRUCTION_CACHE_LINE_16B
+	bool "16 Bytes"
+	depends on ESP32S2_INSTRUCTION_CACHE_16KB
 
-	config ESP32S2_INSTRUCTION_CACHE_LINE_32B
-		bool "32 Bytes"
+config ESP32S2_INSTRUCTION_CACHE_LINE_32B
+	bool "32 Bytes"
 
 endchoice
 
@@ -131,11 +131,11 @@ choice ESP32S2_DATA_CACHE_LINE_SIZE
 	---help---
 		Data cache line size to be set on application startup.
 
-	config ESP32S2_DATA_CACHE_LINE_16B
-		bool "16 Bytes"
+config ESP32S2_DATA_CACHE_LINE_16B
+	bool "16 Bytes"
 
-	config ESP32S2_DATA_CACHE_LINE_32B
-		bool "32 Bytes"
+config ESP32S2_DATA_CACHE_LINE_32B
+	bool "32 Bytes"
 
 endchoice
 
@@ -677,16 +677,16 @@ choice ESP32S2_FLASH_MODE
 		with the attached SPI Flash chip.
 		The option selected here is then used by esptool when flashing.
 
-	config ESP32S2_FLASH_MODE_DIO
+config ESP32S2_FLASH_MODE_DIO
 	bool "Dual IO (DIO)"
 
-	config ESP32S2_FLASH_MODE_DOUT
+config ESP32S2_FLASH_MODE_DOUT
 	bool "Dual Output (DOUT)"
 
-	config ESP32S2_FLASH_MODE_QIO
+config ESP32S2_FLASH_MODE_QIO
 	bool "Quad IO (QIO)"
 
-	config ESP32S2_FLASH_MODE_QOUT
+config ESP32S2_FLASH_MODE_QOUT
 	bool "Quad Output (QOUT)"
 
 endchoice # ESP32S2_FLASH_MODE
@@ -697,16 +697,16 @@ choice ESP32S2_FLASH_FREQ
 	---help---
 		SPI Flash frequency.
 
-	config ESP32S2_FLASH_FREQ_80M
+config ESP32S2_FLASH_FREQ_80M
 	bool "80 MHz"
 
-	config ESP32S2_FLASH_FREQ_40M
+config ESP32S2_FLASH_FREQ_40M
 	bool "40 MHz"
 
-	config ESP32S2_FLASH_FREQ_26M
+config ESP32S2_FLASH_FREQ_26M
 	bool "26 MHz"
 
-	config ESP32S2_FLASH_FREQ_20M
+config ESP32S2_FLASH_FREQ_20M
 	bool "20 MHz"
 
 endchoice # ESP32S2_FLASH_FREQ
diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig
index d9424a85d8f..360ed9fd88a 100644
--- a/arch/xtensa/src/esp32s3/Kconfig
+++ b/arch/xtensa/src/esp32s3/Kconfig
@@ -41,14 +41,14 @@ choice ESP32S3_DEFAULT_CPU_FREQ
 	---help---
 		CPU frequency to be set on application startup.
 
-	config ESP32S3_DEFAULT_CPU_FREQ_80
-		bool "80 MHz"
+config ESP32S3_DEFAULT_CPU_FREQ_80
+	bool "80 MHz"
 
-	config ESP32S3_DEFAULT_CPU_FREQ_160
-		bool "160 MHz"
+config ESP32S3_DEFAULT_CPU_FREQ_160
+	bool "160 MHz"
 
-	config ESP32S3_DEFAULT_CPU_FREQ_240
-		bool "240 MHz"
+config ESP32S3_DEFAULT_CPU_FREQ_240
+	bool "240 MHz"
 
 endchoice # CPU frequency
 
@@ -91,11 +91,11 @@ choice ESP32S3_ICACHE_ASSOCIATED_WAYS
 	---help---
 		Instruction cache associated ways to be set on application startup.
 
-	config ESP32S3_INSTRUCTION_CACHE_4WAYS
-		bool "4 ways"
+config ESP32S3_INSTRUCTION_CACHE_4WAYS
+	bool "4 ways"
 
-	config ESP32S3_INSTRUCTION_CACHE_8WAYS
-		bool "8 ways"
+config ESP32S3_INSTRUCTION_CACHE_8WAYS
+	bool "8 ways"
 
 endchoice
 
@@ -110,12 +110,12 @@ choice ESP32S3_INSTRUCTION_CACHE_LINE_SIZE
 	---help---
 		Instruction cache line size to be set on application startup.
 
-	config ESP32S3_INSTRUCTION_CACHE_LINE_16B
-		bool "16 Bytes"
-		depends on ESP32S3_INSTRUCTION_CACHE_16KB
+config ESP32S3_INSTRUCTION_CACHE_LINE_16B
+	bool "16 Bytes"
+	depends on ESP32S3_INSTRUCTION_CACHE_16KB
 
-	config ESP32S3_INSTRUCTION_CACHE_LINE_32B
-		bool "32 Bytes"
+config ESP32S3_INSTRUCTION_CACHE_LINE_32B
+	bool "32 Bytes"
 
 endchoice
 
@@ -162,11 +162,11 @@ choice ESP32S3_DCACHE_ASSOCIATED_WAYS
 	---help---
 		Data cache associated ways to be set on application startup.
 
-	config ESP32S3_DATA_CACHE_4WAYS
-		bool "4 ways"
+config ESP32S3_DATA_CACHE_4WAYS
+	bool "4 ways"
 
-	config ESP32S3_DATA_CACHE_8WAYS
-		bool "8 ways"
+config ESP32S3_DATA_CACHE_8WAYS
+	bool "8 ways"
 
 endchoice
 
@@ -181,15 +181,15 @@ choice ESP32S3_DATA_CACHE_LINE_SIZE
 	---help---
 		Data cache line size to be set on application startup.
 
-	config ESP32S3_DATA_CACHE_LINE_16B
-		bool "16 Bytes"
-		depends on ESP32S3_DATA_CACHE_16KB || ESP32S3_DATA_CACHE_32KB
+config ESP32S3_DATA_CACHE_LINE_16B
+	bool "16 Bytes"
+	depends on ESP32S3_DATA_CACHE_16KB || ESP32S3_DATA_CACHE_32KB
 
-	config ESP32S3_DATA_CACHE_LINE_32B
-		bool "32 Bytes"
+config ESP32S3_DATA_CACHE_LINE_32B
+	bool "32 Bytes"
 
-	config ESP32S3_DATA_CACHE_LINE_64B
-		bool "64 Bytes"
+config ESP32S3_DATA_CACHE_LINE_64B
+	bool "64 Bytes"
 
 endchoice
 
@@ -1011,20 +1011,20 @@ choice ESP32S3_FLASH_MODE
 		with the attached SPI Flash chip.
 		The option selected here is then used by esptool when flashing.
 
-	config ESP32S3_FLASH_MODE_DIO
-		bool "Dual IO (DIO)"
+config ESP32S3_FLASH_MODE_DIO
+	bool "Dual IO (DIO)"
 
-	config ESP32S3_FLASH_MODE_DOUT
-		bool "Dual Output (DOUT)"
+config ESP32S3_FLASH_MODE_DOUT
+	bool "Dual Output (DOUT)"
 
-	config ESP32S3_FLASH_MODE_QIO
-		bool "Quad IO (QIO)"
+config ESP32S3_FLASH_MODE_QIO
+	bool "Quad IO (QIO)"
 
-	config ESP32S3_FLASH_MODE_QOUT
-		bool "Quad Output (QOUT)"
+config ESP32S3_FLASH_MODE_QOUT
+	bool "Quad Output (QOUT)"
 
-	config ESP32S3_FLASH_MODE_OCT
-		bool "Octal"
+config ESP32S3_FLASH_MODE_OCT
+	bool "Octal"
 
 endchoice # ESP32S3_FLASH_MODE
 
@@ -1034,17 +1034,17 @@ choice ESP32S3_FLASH_FREQ
 	---help---
 		SPI Flash frequency
 
-	config ESP32S3_FLASH_FREQ_120M
-		bool "120 MHz"
+config ESP32S3_FLASH_FREQ_120M
+	bool "120 MHz"
 
-	config ESP32S3_FLASH_FREQ_80M
-		bool "80 MHz"
+config ESP32S3_FLASH_FREQ_80M
+	bool "80 MHz"
 
-	config ESP32S3_FLASH_FREQ_40M
-		bool "40 MHz"
+config ESP32S3_FLASH_FREQ_40M
+	bool "40 MHz"
 
-	config ESP32S3_FLASH_FREQ_20M
-		bool "20 MHz"
+config ESP32S3_FLASH_FREQ_20M
+	bool "20 MHz"
 
 endchoice # ESP32S3_FLASH_FREQ
 
@@ -1060,11 +1060,11 @@ choice ESP32S3_FLASH_SAMPLE_MODE
 	default ESP32S3_FLASH_SAMPLE_MODE_DTR if ESP32S3_FLASH_MODE_OCT
 	default ESP32S3_FLASH_SAMPLE_MODE_STR if !ESP32S3_FLASH_MODE_OCT
 
-	config ESP32S3_FLASH_SAMPLE_MODE_DTR
-		depends on ESP32S3_FLASH_MODE_OCT
-		bool "DTR Mode"
-	config ESP32S3_FLASH_SAMPLE_MODE_STR
-		bool "STR Mode"
+config ESP32S3_FLASH_SAMPLE_MODE_DTR
+	depends on ESP32S3_FLASH_MODE_OCT
+	bool "DTR Mode"
+config ESP32S3_FLASH_SAMPLE_MODE_STR
+	bool "STR Mode"
 endchoice
 
 config ESP32S3_SPI_FLASH_DONT_USE_ROM_CODE
diff --git a/boards/arm/rp2040/raspberrypi-pico-w/Kconfig b/boards/arm/rp2040/raspberrypi-pico-w/Kconfig
index bb9b4932cbd..e3c680b7573 100644
--- a/boards/arm/rp2040/raspberrypi-pico-w/Kconfig
+++ b/boards/arm/rp2040/raspberrypi-pico-w/Kconfig
@@ -13,27 +13,26 @@ endif
 
 if RP2040_INFINEON_CYW43439
 
-	config CYW43439_FIRMWARE_BIN_PATH
-		string "Path to Infineon 43439 firmware file"
-		default "${PICO_SDK_PATH}/lib/cyw43-driver/firmware/43439A0-7.95.49.00.combined"
-		---help---
-			This should be a path to a file containing both the cyw43439 firmware and
-			the CLB blob.  The firmware should be padded to a 256 byte boundary and
-			then the CLM blob should be appended.
+config CYW43439_FIRMWARE_BIN_PATH
+	string "Path to Infineon 43439 firmware file"
+	default "${PICO_SDK_PATH}/lib/cyw43-driver/firmware/43439A0-7.95.49.00.combined"
+	---help---
+		This should be a path to a file containing both the cyw43439 firmware and
+		the CLB blob.  The firmware should be padded to a 256 byte boundary and
+		then the CLM blob should be appended.
 
-			If this file is updated, check the CYW43439_FIRMWARE_LEN below to make sure
-			it reflects the un-padded length of the firmware part.
+		If this file is updated, check the CYW43439_FIRMWARE_LEN below to make sure
+		it reflects the un-padded length of the firmware part.
 
-	config CYW43439_FIRMWARE_LEN
-		int "Infineon 43439 firmware length (bytes)"
-		default 224190
-		---help---
-			This is the length of just the base firmware in the firmware file specified
-			by the "Path to Infineon 43439 firmware file" configuration option.
-
-			This length does not include the length of any padding nor the length of
-			the appended clm_blob. If a clm_blob is present in the firmware file, this
-			length will be less than the length of the whole file.
+config CYW43439_FIRMWARE_LEN
+	int "Infineon 43439 firmware length (bytes)"
+	default 224190
+	---help---
+		This is the length of just the base firmware in the firmware file specified
+		by the "Path to Infineon 43439 firmware file" configuration option.
 
+		This length does not include the length of any padding nor the length of
+		the appended clm_blob. If a clm_blob is present in the firmware file, this
+		length will be less than the length of the whole file.
 
 endif
diff --git a/boards/risc-v/esp32c3/common/Kconfig b/boards/risc-v/esp32c3/common/Kconfig
index 9c32bbd2086..7dc77442416 100644
--- a/boards/risc-v/esp32c3/common/Kconfig
+++ b/boards/risc-v/esp32c3/common/Kconfig
@@ -22,37 +22,37 @@ choice ESP32C3_SPIFLASH_FS
 		bring-up.
 		If not selected, the MTD will be registered as a device node on /dev.
 
-	config ESP32C3_SPIFLASH_SMARTFS
-		bool "SmartFS"
-		select FS_SMARTFS
-		select MTD_SMART
-		depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
+config ESP32C3_SPIFLASH_SMARTFS
+	bool "SmartFS"
+	select FS_SMARTFS
+	select MTD_SMART
+	depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
 
-	comment "SmartFS not supported with Flash Encryption"
-		depends on ESP32C3_SECURE_FLASH_ENC_ENABLED
+comment "SmartFS not supported with Flash Encryption"
+	depends on ESP32C3_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32C3_SPIFLASH_NXFFS
-		bool "NXFFS"
-		select FS_NXFFS
-		depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
+config ESP32C3_SPIFLASH_NXFFS
+	bool "NXFFS"
+	select FS_NXFFS
+	depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
 
 	comment "NXFFS not supported with Flash Encryption"
 		depends on ESP32C3_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32C3_SPIFLASH_SPIFFS
-		bool "SPIFFS"
-		select FS_SPIFFS
-		depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
+config ESP32C3_SPIFLASH_SPIFFS
+	bool "SPIFFS"
+	select FS_SPIFFS
+	depends on !ESP32C3_SECURE_FLASH_ENC_ENABLED
 
-	comment "SPIFFS not supported with Flash Encryption"
-		depends on ESP32C3_SECURE_FLASH_ENC_ENABLED
+comment "SPIFFS not supported with Flash Encryption"
+	depends on ESP32C3_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32C3_SPIFLASH_LITTLEFS
-		bool "LittleFS"
-		select FS_LITTLEFS
+config ESP32C3_SPIFLASH_LITTLEFS
+	bool "LittleFS"
+	select FS_LITTLEFS
 
-	config ESP32C3_SPIFLASH_MTD_CONFIG
-		bool "Non-volatile storage"
+config ESP32C3_SPIFLASH_MTD_CONFIG
+	bool "Non-volatile storage"
 
 endchoice
 
diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index afc26b70b66..5111fdb1d50 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -29,34 +29,34 @@ choice ESP32_SPIFLASH_FS
 		bring-up.
 		If not selected, the MTD will be registered as a device node on /dev.
 
-	config ESP32_SPIFLASH_SMARTFS
-		bool "SmartFS"
-		select FS_SMARTFS
-		select MTD_SMART
-		depends on !ESP32_SECURE_FLASH_ENC_ENABLED
+config ESP32_SPIFLASH_SMARTFS
+	bool "SmartFS"
+	select FS_SMARTFS
+	select MTD_SMART
+	depends on !ESP32_SECURE_FLASH_ENC_ENABLED
 
-	comment "SmartFS not supported with Flash Encryption"
-		depends on ESP32_SECURE_FLASH_ENC_ENABLED
+comment "SmartFS not supported with Flash Encryption"
+	depends on ESP32_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32_SPIFLASH_NXFFS
-		bool "NXFFS"
-		select FS_NXFFS
-		depends on !ESP32_SECURE_FLASH_ENC_ENABLED
+config ESP32_SPIFLASH_NXFFS
+	bool "NXFFS"
+	select FS_NXFFS
+	depends on !ESP32_SECURE_FLASH_ENC_ENABLED
 
-	comment "NXFFS not supported with Flash Encryption"
-		depends on ESP32_SECURE_FLASH_ENC_ENABLED
+comment "NXFFS not supported with Flash Encryption"
+	depends on ESP32_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32_SPIFLASH_SPIFFS
-		bool "SPIFFS"
-		select FS_SPIFFS
-		depends on !ESP32_SECURE_FLASH_ENC_ENABLED
+config ESP32_SPIFLASH_SPIFFS
+	bool "SPIFFS"
+	select FS_SPIFFS
+	depends on !ESP32_SECURE_FLASH_ENC_ENABLED
 
-	comment "SPIFFS not supported with Flash Encryption"
-		depends on ESP32_SECURE_FLASH_ENC_ENABLED
+comment "SPIFFS not supported with Flash Encryption"
+	depends on ESP32_SECURE_FLASH_ENC_ENABLED
 
-	config ESP32_SPIFLASH_LITTLEFS
-		bool "LittleFS"
-		select FS_LITTLEFS
+config ESP32_SPIFLASH_LITTLEFS
+	bool "LittleFS"
+	select FS_LITTLEFS
 
 endchoice
 
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
index e574ca3589e..e955d65e3a5 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
+++ b/boards/xtensa/esp32s3/esp32s3-eye/Kconfig
@@ -29,22 +29,22 @@ choice ESP32S3_SPIFLASH_FS
 		bring-up.
 		If not selected, the MTD will be registered as a device node on /dev.
 
-	config ESP32S3_SPIFLASH_SMARTFS
-		bool "SmartFS"
-		select FS_SMARTFS
-		select MTD_SMART
+config ESP32S3_SPIFLASH_SMARTFS
+	bool "SmartFS"
+	select FS_SMARTFS
+	select MTD_SMART
 
-	config ESP32S3_SPIFLASH_NXFFS
-		bool "NXFFS"
-		select FS_NXFFS
+config ESP32S3_SPIFLASH_NXFFS
+	bool "NXFFS"
+	select FS_NXFFS
 
-	config ESP32S3_SPIFLASH_SPIFFS
-		bool "SPIFFS"
-		select FS_SPIFFS
+config ESP32S3_SPIFLASH_SPIFFS
+	bool "SPIFFS"
+	select FS_SPIFFS
 
-	config ESP32S3_SPIFLASH_LITTLEFS
-		bool "LittleFS"
-		select FS_LITTLEFS
+config ESP32S3_SPIFLASH_LITTLEFS
+	bool "LittleFS"
+	select FS_LITTLEFS
 
 endchoice
 
diff --git a/drivers/analog/Kconfig b/drivers/analog/Kconfig
index 406d65a12c3..b6536a49bb3 100644
--- a/drivers/analog/Kconfig
+++ b/drivers/analog/Kconfig
@@ -179,12 +179,15 @@ config MAX1161X_FREQUENCY
 choice
 	prompt "Maxim MAX1161X Chip Type"
 
-	config MAX1161X_4CHAN
-		bool "MAX11612/MAX11613 4 Channels"
-	config MAX1161X_8CHAN
-		bool "MAX11614/MAX11615 8 Channels"
-	config MAX1161X_12CHAN
-		bool "MAX11616/MAX11617 12 Channels"
+config MAX1161X_4CHAN
+	bool "MAX11612/MAX11613 4 Channels"
+
+config MAX1161X_8CHAN
+	bool "MAX11614/MAX11615 8 Channels"
+
+config MAX1161X_12CHAN
+	bool "MAX11616/MAX11617 12 Channels"
+
 endchoice
 
 endif # ADC_MAX1161X
diff --git a/drivers/power/battery/Kconfig b/drivers/power/battery/Kconfig
index dc8e6de919f..fcbf39f3cea 100644
--- a/drivers/power/battery/Kconfig
+++ b/drivers/power/battery/Kconfig
@@ -148,9 +148,9 @@ config I2C_BQ769X0
 	bool
 
 if BQ769X0
-	config BQ769X0_USE_INTERNAL_TS
-		bool "Use internal temperature sensor on BQ769X0"
-		default n
+config BQ769X0_USE_INTERNAL_TS
+	bool "Use internal temperature sensor on BQ769X0"
+	default n
 endif
 
 endmenu