kconfig: Global whitespace/consistency cleanup

Clean up space errors and use a consistent style throughout the Kconfig
files. This makes reading the Kconfig files more distraction-free, helps
with grepping, and encourages the same style getting copied around
everywhere (meaning another pass hopefully won't be needed).

Go for the most common style:

 - Indent properties with a single tab, including for choices.

   Properties on choices work exactly the same syntactically as
   properties on symbols, so not sure how the no-indentation thing
   happened.

 - Indent help texts with a tab followed by two spaces

 - Put a space between 'config' and the symbol name, not a tab. This
   also helps when grepping for definitions.

 - Do '# A comment' instead of '#A comment'

I tweaked Kconfiglib a bit to find most of the stuff.

Some help texts were reflowed to 79 columns with 'gq' in Vim as well,
though not all, because I was afraid I'd accidentally mess up
formatting.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 11420d6..bd17a0b 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -74,9 +74,9 @@
 endchoice
 
 config CODE_DATA_RELOCATION
-       bool "Relocate code/data sections"
-       depends on ARM
-       help
+	bool "Relocate code/data sections"
+	depends on ARM
+	help
 	  When selected this will relocate .text, data and .bss sections from
 	  the specified files and places it in the required memory region. The
 	  files should be specified in the CMakeList.txt file with
diff --git a/arch/Kconfig b/arch/Kconfig
index e2b0b79..828ba24 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -69,15 +69,14 @@
 source "subsys/logging/Kconfig.template.log_config"
 
 config BIG_ENDIAN
-       bool
-       help
-         This option tells the build system that the target system is
-         big-endian.  Little-endian architecture is the default and
-         should leave this option unselected.  This option is selected
-         by arch/$ARCH/Kconfig, soc/**/Kconfig, or boards/**/Kconfig
-         and the user should generally avoid modifying it.  The option
-         is used to select linker script OUTPUT_FORMAT and command
-         line option for gen_isr_tables.py.
+	bool
+	help
+	  This option tells the build system that the target system is big-endian.
+	  Little-endian architecture is the default and should leave this option
+	  unselected.  This option is selected by arch/$ARCH/Kconfig,
+	  soc/**/Kconfig, or boards/**/Kconfig and the user should generally avoid
+	  modifying it.  The option is used to select linker script OUTPUT_FORMAT
+	  and command line option for gen_isr_tables.py.
 
 config 64BIT
 	bool
@@ -234,14 +233,14 @@
 	bool "Allow kernel objects to be allocated at runtime"
 	depends on USERSPACE
 	help
-	Enabling this option allows for kernel objects to be requested from
-	the calling thread's resource pool, at a slight cost in performance
-	due to the supplemental run-time tables required to validate such
-	objects.
+	  Enabling this option allows for kernel objects to be requested from
+	  the calling thread's resource pool, at a slight cost in performance
+	  due to the supplemental run-time tables required to validate such
+	  objects.
 
-	Objects allocated in this way can be freed with a supervisor-only
-	API call, or when the number of references to that object drops to
-	zero.
+	  Objects allocated in this way can be freed with a supervisor-only
+	  API call, or when the number of references to that object drops to
+	  zero.
 
 if ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 1c12826..fce4419 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -16,14 +16,14 @@
 	prompt "ARC core family"
 	default CPU_ARCEM
 
-config	CPU_ARCEM
+config CPU_ARCEM
 	bool "ARC EM cores"
 	select CPU_ARCV2
 	select ATOMIC_OPERATIONS_C
 	help
 	  This option signifies the use of an ARC EM CPU
 
-config	CPU_ARCHS
+config CPU_ARCHS
 	bool "ARC HS cores"
 	select CPU_ARCV2
 	select ATOMIC_OPERATIONS_BUILTIN
@@ -64,7 +64,7 @@
 
 menu "ARCv2 Family Options"
 
-config	CPU_ARCV2
+config CPU_ARCV2
 	bool
 	select ARCH_HAS_STACK_PROTECTION if ARC_HAS_STACK_CHECKING || ARC_MPU
 	select ARCH_HAS_USERSPACE if ARC_MPU
@@ -74,7 +74,7 @@
 	help
 	  This option signifies the use of a CPU of the ARCv2 family.
 
-config	NUM_IRQ_PRIO_LEVELS
+config NUM_IRQ_PRIO_LEVELS
 	int "Number of supported interrupt priority levels"
 	range 1 16
 	help
@@ -83,7 +83,7 @@
 
 	  The BSP must provide a valid default for proper operation.
 
-config	NUM_IRQS
+config NUM_IRQS
 	int "Upper limit of interrupt numbers/IDs used"
 	range 17 256
 	help
@@ -94,7 +94,7 @@
 	  The BSP must provide a valid default. This drives the size of the
 	  vector table.
 
-config	RGF_NUM_BANKS
+config RGF_NUM_BANKS
 	int "Number of General Purpose Register Banks"
 	depends on CPU_ARCV2
 	range 1 2
@@ -140,7 +140,7 @@
 	  checking stack accesses and raising an exception when a stack
 	  overflow or underflow is detected.
 
-config	ARC_CONNECT
+config ARC_CONNECT
 	bool "ARC has ARC connect"
 	select SCHED_IPI_SUPPORTED
 	help
@@ -152,7 +152,7 @@
 	help
 	  Use ARC STACK_CHECKING to do stack protection
 
-config	ARC_STACK_PROTECTION
+config ARC_STACK_PROTECTION
 	bool
 	default y if HW_STACK_PROTECTION
 	select ARC_STACK_CHECKING if ARC_HAS_STACK_CHECKING
@@ -168,7 +168,7 @@
 	  selection of the ARC stack checking is
 	  prioritized over the MPU-based stack guard.
 
-config	ARC_USE_UNALIGNED_MEM_ACCESS
+config ARC_USE_UNALIGNED_MEM_ACCESS
 	bool "Enable unaligned access in HW"
 	default n if CPU_ARCEM
 	default y if CPU_ARCHS
@@ -178,7 +178,7 @@
 	  to support unaligned memory access which is then disabled by default.
 	  Enable unaligned access in hardware and make software to use it.
 
-config	FAULT_DUMP
+config FAULT_DUMP
 	int "Fault dump level"
 	default 2
 	range 0 2
@@ -193,7 +193,7 @@
 
 	  0: Off.
 
-config	XIP
+config XIP
 	default y if !UART_NSIM
 
 config GEN_ISR_TABLES
diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig
index 43f425f..b89213d 100644
--- a/arch/arm/core/cortex_m/Kconfig
+++ b/arch/arm/core/cortex_m/Kconfig
@@ -111,7 +111,7 @@
 
 	  In an ARMv8-M Mainline implementation with the Security Extension
 	  the MSPLIM, PSPLIM registers have additional Secure instances.
-  	  In an ARMv8-M Baseline implementation with the Security Extension
+	  In an ARMv8-M Baseline implementation with the Security Extension
 	  the MSPLIM, PSPLIM registers have only Secure instances.
 
 config CPU_CORTEX_M_HAS_PROGRAMMABLE_FAULT_PRIOS
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index e18a16d..9ca8309 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -65,8 +65,8 @@
 	  describing what that cause code means.
 
 choice
-prompt "Global Pointer options"
-default GP_GLOBAL
+	prompt "Global Pointer options"
+	default GP_GLOBAL
 
 config GP_NONE
 	bool "No global pointer"
diff --git a/boards/Kconfig b/boards/Kconfig
index 08498c5..59ab9b3 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -17,8 +17,10 @@
 # Note: $BOARD_DIR might be a glob pattern
 
 choice
-prompt "Board Selection"
+	prompt "Board Selection"
+
 source "$(BOARD_DIR)/Kconfig.board"
+
 endchoice
 
 
diff --git a/boards/arm/bl654_dvk/Kconfig b/boards/arm/bl654_dvk/Kconfig
index e2ee17f..369a13c 100644
--- a/boards/arm/bl654_dvk/Kconfig
+++ b/boards/arm/bl654_dvk/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_BL654_DVK
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_BL654_DVK
diff --git a/boards/arm/disco_l475_iot1/Kconfig.defconfig b/boards/arm/disco_l475_iot1/Kconfig.defconfig
index 124b670..4ca8179 100644
--- a/boards/arm/disco_l475_iot1/Kconfig.defconfig
+++ b/boards/arm/disco_l475_iot1/Kconfig.defconfig
@@ -77,7 +77,7 @@
 config VL53L0X_XSHUT_GPIO_PIN_NUM
 	default 6
 
-endif #VL53L0X
+endif # VL53L0X
 
 if LSM6DSL
 
@@ -107,7 +107,7 @@
 config BT_HCI_VS_EXT
 	default n
 
-endif #BT
+endif # BT
 
 if WIFI
 
@@ -117,6 +117,6 @@
 config WIFI_ESWIFI
 	default y
 
-endif #WIFI
+endif # WIFI
 
 endif # BOARD_DISCO_L475_IOT1
diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
index 789ca12..3ad2e59 100644
--- a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
+++ b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
@@ -99,7 +99,6 @@
 # If RTOS timer is not enabled we use ARM Cortex-M
 # SYSTICK. SYSTICK frequency is 48MHz divided by
 # SOC_MEC1501_PROC_CLK_DIV.
-#
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 48000000
@@ -117,6 +116,5 @@
 config PS2_XEC_1
 	default y
 
-endif #PS2
+endif # PS2
 endif # BOARD_MEC1501MODULAR_ASSY6885
-
diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
index be7a058..95957f6 100644
--- a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
+++ b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
@@ -112,12 +112,12 @@
 if PS2
 
 config PS2_XEC_0
-        default y
+	default y
 
 config PS2_XEC_1
-        default y
+	default y
 
-endif #PS2
+endif # PS2
 
 if SPI
 
diff --git a/boards/arm/nrf52810_pca10040/Kconfig b/boards/arm/nrf52810_pca10040/Kconfig
index a60fdd4..2b2c010 100644
--- a/boards/arm/nrf52810_pca10040/Kconfig
+++ b/boards/arm/nrf52810_pca10040/Kconfig
@@ -7,9 +7,9 @@
 if BOARD_NRF52810_PCA10040
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 # BT_CTLR depends on BT. When BT is enabled we should default to also
 # enabling the controller.
diff --git a/boards/arm/nrf52811_pca10056/Kconfig b/boards/arm/nrf52811_pca10056/Kconfig
index a386423..129872d 100644
--- a/boards/arm/nrf52811_pca10056/Kconfig
+++ b/boards/arm/nrf52811_pca10056/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_NRF52811_PCA10056
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_NRF52811_PCA10056
diff --git a/boards/arm/nrf52840_blip/Kconfig b/boards/arm/nrf52840_blip/Kconfig
index dc496a3..c411836 100644
--- a/boards/arm/nrf52840_blip/Kconfig
+++ b/boards/arm/nrf52840_blip/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_NRF52840_BLIP
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_NRF52840_BLIP
diff --git a/boards/arm/nrf52840_blip/Kconfig.defconfig b/boards/arm/nrf52840_blip/Kconfig.defconfig
index 13c74f5..6f354db 100644
--- a/boards/arm/nrf52840_blip/Kconfig.defconfig
+++ b/boards/arm/nrf52840_blip/Kconfig.defconfig
@@ -12,7 +12,7 @@
 if ADC
 
 config ADC_0
-        default y
+	default y
 
 endif # ADC
 
diff --git a/boards/arm/nrf52840_mdk/Kconfig b/boards/arm/nrf52840_mdk/Kconfig
index 3db4ac8..1ac8f90 100644
--- a/boards/arm/nrf52840_mdk/Kconfig
+++ b/boards/arm/nrf52840_mdk/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_NRF52840_MDK
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_NRF52840_MDK
diff --git a/boards/arm/nrf52840_papyr/Kconfig b/boards/arm/nrf52840_papyr/Kconfig
index ff62fb5..bb58192 100644
--- a/boards/arm/nrf52840_papyr/Kconfig
+++ b/boards/arm/nrf52840_papyr/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_NRF52840_PAPYR
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_NRF52840_PAPYR
diff --git a/boards/arm/nrf52840_papyr/Kconfig.defconfig b/boards/arm/nrf52840_papyr/Kconfig.defconfig
index f4c3e73..a2af365 100644
--- a/boards/arm/nrf52840_papyr/Kconfig.defconfig
+++ b/boards/arm/nrf52840_papyr/Kconfig.defconfig
@@ -12,7 +12,7 @@
 if ADC
 
 config ADC_0
-        default y
+	default y
 
 endif # ADC
 
diff --git a/boards/arm/nrf52840_pca10056/Kconfig b/boards/arm/nrf52840_pca10056/Kconfig
index 7506e35..9d2d0cb 100644
--- a/boards/arm/nrf52840_pca10056/Kconfig
+++ b/boards/arm/nrf52840_pca10056/Kconfig
@@ -7,8 +7,8 @@
 if BOARD_NRF52840_PCA10056
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 endif # BOARD_NRF52840_PCA10056
diff --git a/boards/arm/nrf52840_pca10059/Kconfig b/boards/arm/nrf52840_pca10059/Kconfig
index c628a1a..65d0c43 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig
+++ b/boards/arm/nrf52840_pca10059/Kconfig
@@ -7,15 +7,15 @@
 if BOARD_NRF52840_PCA10059
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 config BOARD_HAS_NRF5_BOOTLOADER
 	bool "Board has nRF5 bootloader"
 	default y
 	help
-	 If selected, applications are linked so that they can be loaded by
-	 Nordic nRF5 bootloader.
+	  If selected, applications are linked so that they can be loaded by Nordic
+	  nRF5 bootloader.
 
 endif # BOARD_NRF52840_PCA10059
diff --git a/boards/arm/nrf52840_pca10059/Kconfig.defconfig b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
index 5ef11d3..383cfb9 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig.defconfig
+++ b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
@@ -23,7 +23,7 @@
 # so no override is necessary.
 
 config FLASH_LOAD_OFFSET
-        default 0x1000
+	default 0x1000
 
 endif # BOARD_HAS_NRF5_BOOTLOADER && !USE_CODE_PARTITION
 
diff --git a/boards/arm/nrf52840_pca10090/Kconfig b/boards/arm/nrf52840_pca10090/Kconfig
index 3fe793b..00b101f 100644
--- a/boards/arm/nrf52840_pca10090/Kconfig
+++ b/boards/arm/nrf52840_pca10090/Kconfig
@@ -7,9 +7,9 @@
 if BOARD_NRF52840_PCA10090
 
 config BOARD_ENABLE_DCDC
-        bool "Enable DCDC mode"
-        select SOC_DCDC_NRF52X
-        default y
+	bool "Enable DCDC mode"
+	select SOC_DCDC_NRF52X
+	default y
 
 choice
 	prompt "nRF9160 UART0 routing"
@@ -138,17 +138,17 @@
 config BOARD_PCA10090_INTERFACE0_ARDUINO
 	bool "Route to Arduino pins"
 	help
-	 Pin 0: nRF9160 P0.17 connects to A3
-	 Pin 1: nRF9160 P0.18 connects to A4
-	 Pin 2: nRF9160 P0.19 connects to A5
+	  Pin 0: nRF9160 P0.17 connects to A3
+	  Pin 1: nRF9160 P0.18 connects to A4
+	  Pin 2: nRF9160 P0.19 connects to A5
 
 config BOARD_PCA10090_INTERFACE0_MCU
 	bool "Route to nRF52840"
 	help
-	 This connects the following pins on the nRF9160 to pins on the nRF52840:
-	 Pin 0: nRF9160 P0.17 connects to nRF52840 P0.17
-	 Pin 1: nRF9160 P0.18 connects to nRF52840 P0.20
-	 Pin 2: nRF9160 P0.19 connects to nRF52840 P0.15
+	  This connects the following pins on the nRF9160 to pins on the nRF52840:
+	  Pin 0: nRF9160 P0.17 connects to nRF52840 P0.17
+	  Pin 1: nRF9160 P0.18 connects to nRF52840 P0.20
+	  Pin 2: nRF9160 P0.19 connects to nRF52840 P0.15
 
 endchoice
 
@@ -159,16 +159,16 @@
 config BOARD_PCA10090_INTERFACE1_TRACE
 	bool "Route to TRACE interface"
 	help
-	 Pin 3: nRF9160 P0.21 connects to TRACECLK
-	 Pin 4: nRF9160 P0.22 connects to TRACEDATA0
-	 Pin 5: nRF9160 P0.23 connects to TRACEDATA1
+	  Pin 3: nRF9160 P0.21 connects to TRACECLK
+	  Pin 4: nRF9160 P0.22 connects to TRACEDATA0
+	  Pin 5: nRF9160 P0.23 connects to TRACEDATA1
 
 config BOARD_PCA10090_INTERFACE1_MCU
 	bool "Route to nRF52840"
 	help
-	 Pin 3: nRF9160 P0.21 connects to nRF52840 P0.22
-	 Pin 4: nRF9160 P0.22 connects to nRF52840 P1.04
-	 Pin 5: nRF9160 P0.23 connects to nRF52840 P1.02
+	  Pin 3: nRF9160 P0.21 connects to nRF52840 P0.22
+	  Pin 4: nRF9160 P0.22 connects to nRF52840 P1.04
+	  Pin 5: nRF9160 P0.23 connects to nRF52840 P1.02
 
 endchoice
 
@@ -179,25 +179,25 @@
 config BOARD_PCA10090_INTERFACE2_COEX
 	bool "Route to COEX interface"
 	help
-	 Pin 6: nRF9160 COEX0 connects to COEX0_PH
-	 Pin 7: nRF9160 COEX1 connects to COEX1_PH
-	 Pin 8: nRF9160 COEX2 connects to COEX2_PH
+	  Pin 6: nRF9160 COEX0 connects to COEX0_PH
+	  Pin 7: nRF9160 COEX1 connects to COEX1_PH
+	  Pin 8: nRF9160 COEX2 connects to COEX2_PH
 
 config BOARD_PCA10090_INTERFACE2_MCU
 	bool "Route to nRF52840"
 	help
-	 Pin 6: nRF9160 COEX0 connects to nRF52840 P1.13
-	 Pin 7: nRF9160 COEX1 connects to nRF52840 P1.11
-	 Pin 8: nRF9160 COEX2 connects to nRF52840 P1.15
+	  Pin 6: nRF9160 COEX0 connects to nRF52840 P1.13
+	  Pin 7: nRF9160 COEX1 connects to nRF52840 P1.11
+	  Pin 8: nRF9160 COEX2 connects to nRF52840 P1.15
 
 endchoice
 
 config BOARD_PCA10090_NRF52840_RESET
 	bool "Enable GPIO reset line"
 	help
-	 Let the nRF52840 be reset from the nRF9160 via a GPIO line.
-	 The GPIO line may only be one of the first 6 MCU interface pins.
-	 The line is active high.
+	  Let the nRF52840 be reset from the nRF9160 via a GPIO line.
+	  The GPIO line may only be one of the first 6 MCU interface pins.
+	  The line is active high.
 
 if BOARD_PCA10090_NRF52840_RESET
 
@@ -210,43 +210,43 @@
 	bool "P0.17"
 	depends on BOARD_PCA10090_INTERFACE0_MCU
 	help
-	 Pin P0.17 on nRF52840,
-	 connected to P0.17 on the nRF9160.
+	  Pin P0.17 on nRF52840,
+	  connected to P0.17 on the nRF9160.
 
 config BOARD_PCA10090_NRF52840_RESET_P0_20
 	bool "P0.20"
 	depends on BOARD_PCA10090_INTERFACE0_MCU
 	help
-	 Pin P0.20 on nRF52840,
-	 connected to P0.18 on the nRF9160.
+	  Pin P0.20 on nRF52840,
+	  connected to P0.18 on the nRF9160.
 
 config BOARD_PCA10090_NRF52840_RESET_P0_15
 	bool "P0.15"
 	depends on BOARD_PCA10090_INTERFACE0_MCU
 	help
-	 Pin P0.15 on nRF52840,
-	 connected to P0.19 on the nRF9160.
+	  Pin P0.15 on nRF52840,
+	  connected to P0.19 on the nRF9160.
 
 config BOARD_PCA10090_NRF52840_RESET_P0_22
 	bool "P0.22"
 	depends on BOARD_PCA10090_INTERFACE1_MCU
 	help
-	 Pin P0.22 on nRF52840,
-	 connected to P0.21 on the nRF9160.
+	  Pin P0.22 on nRF52840,
+	  connected to P0.21 on the nRF9160.
 
 config BOARD_PCA10090_NRF52840_RESET_P1_04
 	bool "P1.04"
 	depends on BOARD_PCA10090_INTERFACE1_MCU
 	help
-	 Pin P1.04 on nRF52840,
-	 connected to P0.22 on the nRF9160.
+	  Pin P1.04 on nRF52840,
+	  connected to P0.22 on the nRF9160.
 
 config BOARD_PCA10090_NRF52840_RESET_P1_02
 	bool "P1.02"
 	depends on BOARD_PCA10090_INTERFACE1_MCU
 	help
-	 Pin P1.02 on nRF52840,
-	 connected to P0.23 on the nRF9160.
+	  Pin P1.02 on nRF52840,
+	  connected to P0.23 on the nRF9160.
 
 endchoice
 
diff --git a/boards/arm/nrf9160_pca10090/Kconfig b/boards/arm/nrf9160_pca10090/Kconfig
index de7de84..4afec0f 100644
--- a/boards/arm/nrf9160_pca10090/Kconfig
+++ b/boards/arm/nrf9160_pca10090/Kconfig
@@ -7,21 +7,21 @@
 if BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS
 
 config BOARD_NRF52840_GPIO_RESET
-        bool "Use nRF52840 PCA10090 GPIO reset pin"
+	bool "Use nRF52840 PCA10090 GPIO reset pin"
 	default y if BT_H4
-        help
-          Use a GPIO pin to reset the nRF52840 controller and let it wait
-          until all bytes traveling to the H4 device have been received
-          and drained, thus ensuring communication can begin correctly.
+	help
+	  Use a GPIO pin to reset the nRF52840 controller and let it wait until all
+	  bytes traveling to the H4 device have been received and drained, thus
+	  ensuring communication can begin correctly.
 
 if BOARD_NRF52840_GPIO_RESET
 
 config BOARD_NRF52840_GPIO_RESET_PIN
-        int "Reset pin"
-        range 17 23
-        default 23
-        help
-          GPIO pin on the nRF9160 used to reset the nRF52840.
+	int "Reset pin"
+	range 17 23
+	default 23
+	help
+	  GPIO pin on the nRF9160 used to reset the nRF52840.
 
 endif
 
diff --git a/boards/arm/particle_argon/Kconfig.defconfig b/boards/arm/particle_argon/Kconfig.defconfig
index 6d3f6ad..7597591 100644
--- a/boards/arm/particle_argon/Kconfig.defconfig
+++ b/boards/arm/particle_argon/Kconfig.defconfig
@@ -26,7 +26,7 @@
 if SPI
 
 config SPI_2
-       default y
+	default y
 
 endif # SPI
 
diff --git a/boards/arm/particle_boron/Kconfig.defconfig b/boards/arm/particle_boron/Kconfig.defconfig
index 85d5049..9e9390f 100644
--- a/boards/arm/particle_boron/Kconfig.defconfig
+++ b/boards/arm/particle_boron/Kconfig.defconfig
@@ -26,7 +26,7 @@
 if SPI
 
 config SPI_2
-       default y
+	default y
 
 endif # SPI
 
diff --git a/boards/arm/particle_xenon/Kconfig.defconfig b/boards/arm/particle_xenon/Kconfig.defconfig
index b008e86..d7231f1 100644
--- a/boards/arm/particle_xenon/Kconfig.defconfig
+++ b/boards/arm/particle_xenon/Kconfig.defconfig
@@ -27,7 +27,7 @@
 if SPI
 
 config SPI_2
-       default y
+	default y
 
 endif # SPI
 
diff --git a/boards/arm/qemu_cortex_m3/Kconfig.defconfig b/boards/arm/qemu_cortex_m3/Kconfig.defconfig
index e98aadb..0e267c0 100644
--- a/boards/arm/qemu_cortex_m3/Kconfig.defconfig
+++ b/boards/arm/qemu_cortex_m3/Kconfig.defconfig
@@ -3,7 +3,7 @@
 if BOARD_QEMU_CORTEX_M3
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_cortex_m3"
diff --git a/boards/arm/steval_fcu001v1/Kconfig.defconfig b/boards/arm/steval_fcu001v1/Kconfig.defconfig
index ce1a9bc..acbd99e 100644
--- a/boards/arm/steval_fcu001v1/Kconfig.defconfig
+++ b/boards/arm/steval_fcu001v1/Kconfig.defconfig
@@ -31,7 +31,7 @@
 config PWM_STM32_2
 	default y
 
-endif #PWM
+endif # PWM
 
 
 endif # BOARD_STEVAL_FCU001V1
diff --git a/boards/arm/twr_ke18f/Kconfig b/boards/arm/twr_ke18f/Kconfig
index 0f0ad95..60cbb0e 100644
--- a/boards/arm/twr_ke18f/Kconfig
+++ b/boards/arm/twr_ke18f/Kconfig
@@ -27,4 +27,4 @@
 	depends on SPI_1
 	default y
 
-endif #BOARD_TWR_KE18F
+endif # BOARD_TWR_KE18F
diff --git a/boards/nios2/qemu_nios2/Kconfig.defconfig b/boards/nios2/qemu_nios2/Kconfig.defconfig
index 0e6b881..b550e80 100644
--- a/boards/nios2/qemu_nios2/Kconfig.defconfig
+++ b/boards/nios2/qemu_nios2/Kconfig.defconfig
@@ -3,7 +3,7 @@
 if BOARD_QEMU_NIOS2
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_nios2"
diff --git a/boards/posix/native_posix/Kconfig.defconfig b/boards/posix/native_posix/Kconfig.defconfig
index f7943a3..0b40bb2 100644
--- a/boards/posix/native_posix/Kconfig.defconfig
+++ b/boards/posix/native_posix/Kconfig.defconfig
@@ -72,7 +72,7 @@
 config UART_CONSOLE
 	default y if SERIAL
 
-endif #CONSOLE
+endif # CONSOLE
 
 if DISPLAY
 
diff --git a/boards/riscv/qemu_riscv32/Kconfig.defconfig b/boards/riscv/qemu_riscv32/Kconfig.defconfig
index 8afd210..b432bd9 100644
--- a/boards/riscv/qemu_riscv32/Kconfig.defconfig
+++ b/boards/riscv/qemu_riscv32/Kconfig.defconfig
@@ -3,7 +3,7 @@
 if BOARD_QEMU_RISCV32
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_riscv32"
diff --git a/boards/riscv/qemu_riscv64/Kconfig.defconfig b/boards/riscv/qemu_riscv64/Kconfig.defconfig
index fd74e51..d3189fa 100644
--- a/boards/riscv/qemu_riscv64/Kconfig.defconfig
+++ b/boards/riscv/qemu_riscv64/Kconfig.defconfig
@@ -4,7 +4,7 @@
 if BOARD_QEMU_RISCV64
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_riscv64"
diff --git a/boards/x86/qemu_x86/Kconfig.defconfig b/boards/x86/qemu_x86/Kconfig.defconfig
index ee8c170..5ed4d6e 100644
--- a/boards/x86/qemu_x86/Kconfig.defconfig
+++ b/boards/x86/qemu_x86/Kconfig.defconfig
@@ -3,7 +3,7 @@
 if BOARD_QEMU_X86
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_x86"
diff --git a/boards/x86/up_squared/Kconfig b/boards/x86/up_squared/Kconfig
index 1eb3704..925ab89 100644
--- a/boards/x86/up_squared/Kconfig
+++ b/boards/x86/up_squared/Kconfig
@@ -11,8 +11,8 @@
 comment "UP Squared Board Options"
 
 choice
-prompt "UP Squared SoC variant"
-default BOARD_UP_SQUARED_ATOM
+	prompt "UP Squared SoC variant"
+	default BOARD_UP_SQUARED_ATOM
 
 config BOARD_UP_SQUARED_ATOM
 	bool "Atom E3940"
diff --git a/boards/xtensa/qemu_xtensa/Kconfig.defconfig b/boards/xtensa/qemu_xtensa/Kconfig.defconfig
index 379eea0..f8584ad 100644
--- a/boards/xtensa/qemu_xtensa/Kconfig.defconfig
+++ b/boards/xtensa/qemu_xtensa/Kconfig.defconfig
@@ -5,7 +5,7 @@
 if BOARD_QEMU_XTENSA
 
 config BUILD_OUTPUT_BIN
-        default n
+	default n
 
 config BOARD
 	default "qemu_xtensa"
diff --git a/drivers/can/Kconfig.net b/drivers/can/Kconfig.net
index f74da66..da7b9e2 100644
--- a/drivers/can/Kconfig.net
+++ b/drivers/can/Kconfig.net
@@ -34,4 +34,4 @@
 	  Note that the priority needs to be lower than the net stack
 	  so that it can start before the networking sub-system.
 
-endif #CAN_NET
+endif # CAN_NET
diff --git a/drivers/clock_control/Kconfig.beetle b/drivers/clock_control/Kconfig.beetle
index 05074fb..3672bfb 100644
--- a/drivers/clock_control/Kconfig.beetle
+++ b/drivers/clock_control/Kconfig.beetle
@@ -13,18 +13,18 @@
 	depends on SOC_SERIES_BEETLE
 	default y if SOC_SERIES_BEETLE
 	help
-	 Enable driver for Reset & Clock Control subsystem found
-	 in STM32F4 family of MCUs
+	  Enable driver for Reset & Clock Control subsystem found
+	  in STM32F4 family of MCUs
 
 config CLOCK_CONTROL_BEETLE_DEVICE_INIT_PRIORITY
 	int "Clock Control Device Priority"
 	default 1
 	depends on CLOCK_CONTROL_BEETLE
 	help
-	 This option controls the priority of clock control
-	 device initialization. Higher priority ensures that the device
-	 is initialized earlier in the startup cycle. If unsure, leave
-	 at default value 1
+	  This option controls the priority of clock control
+	  device initialization. Higher priority ensures that the device
+	  is initialized earlier in the startup cycle. If unsure, leave
+	  at default value 1
 
 config ARM_CLOCK_CONTROL_DEV_NAME
 	string "Clock Config Device name"
diff --git a/drivers/clock_control/Kconfig.stm32 b/drivers/clock_control/Kconfig.stm32
index 3d55090..dd38dd1 100644
--- a/drivers/clock_control/Kconfig.stm32
+++ b/drivers/clock_control/Kconfig.stm32
@@ -29,7 +29,7 @@
 	  at default value 1
 
 choice CLOCK_STM32_SYSCLK_SRC
-prompt "STM32 System Clock Source"
+	prompt "STM32 System Clock Source"
 
 config CLOCK_STM32_SYSCLK_SRC_HSE
 	bool "HSE"
@@ -87,9 +87,9 @@
 	  Range 11: 48 MHz
 
 choice
-prompt "STM32 PLL Clock Source"
-depends on CLOCK_STM32_SYSCLK_SRC_PLL
-default CLOCK_STM32_PLL_SRC_HSI
+	prompt "STM32 PLL Clock Source"
+	default CLOCK_STM32_PLL_SRC_HSI
+	depends on CLOCK_STM32_SYSCLK_SRC_PLL
 
 config CLOCK_STM32_PLL_SRC_MSI
 	bool "MSI"
@@ -111,8 +111,8 @@
 	bool "PLL2"
 	depends on SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE
 	help
-	 Use PLL2 as source of main PLL. This is equivalent of defining
-	 PLL2 as source PREDIV1SCR. If not selected, default source is HSE.
+	  Use PLL2 as source of main PLL. This is equivalent of defining
+	  PLL2 as source PREDIV1SCR. If not selected, default source is HSE.
 
 endchoice
 
@@ -190,8 +190,8 @@
 # Micro-controller Clock output configuration options
 
 choice
-prompt "STM32 MCO1 Clock Source"
-default CLOCK_STM32_MCO1_SRC_NOCLOCK
+	prompt "STM32 MCO1 Clock Source"
+	default CLOCK_STM32_MCO1_SRC_NOCLOCK
 
 config CLOCK_STM32_MCO1_SRC_NOCLOCK
 	bool "NOCLOCK"
@@ -233,8 +233,8 @@
 	  allowed values: 1, 2, 3, 4, 5
 
 choice
-prompt "STM32 MCO2 Clock Source"
-default CLOCK_STM32_MCO2_SRC_NOCLOCK
+	prompt "STM32 MCO2 Clock Source"
+	default CLOCK_STM32_MCO2_SRC_NOCLOCK
 
 config CLOCK_STM32_MCO2_SRC_NOCLOCK
 	bool "NOCLOCK"
diff --git a/drivers/clock_control/Kconfig.stm32f0_f3 b/drivers/clock_control/Kconfig.stm32f0_f3
index 8ecfb28..a32b24d 100644
--- a/drivers/clock_control/Kconfig.stm32f0_f3
+++ b/drivers/clock_control/Kconfig.stm32f0_f3
@@ -12,7 +12,7 @@
 	default 1
 	range 1 16
 	help
-	 PREDIV is PLLSCR clock signal prescaler, allowed values: 1 - 16.
+	  PREDIV is PLLSCR clock signal prescaler, allowed values: 1 - 16.
 
 config CLOCK_STM32_PLL_PREDIV1
 	int "PREDIV1 Prescaler"
@@ -21,12 +21,12 @@
 	default 1
 	range 1 16
 	help
-	 PREDIV is PLLSCR clock signal prescaler, present on STM32F0 SoC having
-	 an HSE Oscillator available like the stm32f04xx, stm32f07xx,
-	 stm32f09xx and stm32f030xc parts. If configured on a non supported
-	 part, the HSI oscillator will be used a default PLL source and this
-	 config will be ignored.
-	 Allowed values: 1 - 16.
+	  PREDIV is PLLSCR clock signal prescaler, present on STM32F0 SoC having
+	  an HSE Oscillator available like the stm32f04xx, stm32f07xx,
+	  stm32f09xx and stm32f030xc parts. If configured on a non supported
+	  part, the HSI oscillator will be used a default PLL source and this
+	  config will be ignored.
+	  Allowed values: 1 - 16.
 
 config CLOCK_STM32_PLL_MULTIPLIER
 	int "PLL multiplier"
@@ -34,6 +34,6 @@
 	default 6
 	range 2 16
 	help
-	 PLL multiplier, allowed values: 2-16. PLL output must not exceed 48MHz.
+	  PLL multiplier, allowed values: 2-16. PLL output must not exceed 48MHz.
 
 endif # SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X
diff --git a/drivers/clock_control/Kconfig.stm32f1 b/drivers/clock_control/Kconfig.stm32f1
index d55c155..b96a167 100644
--- a/drivers/clock_control/Kconfig.stm32f1
+++ b/drivers/clock_control/Kconfig.stm32f1
@@ -11,7 +11,7 @@
 	bool "HSE to PLL /2 prescaler"
 	depends on SOC_STM32F10X_DENSITY_DEVICE && CLOCK_STM32_PLL_SRC_HSE
 	help
-	 Enable this option to enable /2 prescaler on HSE to PLL clock signal
+	  Enable this option to enable /2 prescaler on HSE to PLL clock signal
 
 config CLOCK_STM32_PLL_MULTIPLIER
 	int "PLL multiplier"
@@ -20,9 +20,9 @@
 	range 2 16 if SOC_STM32F10X_DENSITY_DEVICE
 	range 4 9 if SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE
 	help
-	 PLL multiplier, PLL output must not exceed 72MHz. Allowed values:
-	 Density devices: 2-16
-	 Connectivity devices:  4 - 9 and 13 ( used for multiplication factor 6.5).
+	  PLL multiplier, PLL output must not exceed 72MHz. Allowed values:
+	  Density devices: 2-16
+	  Connectivity devices:  4 - 9 and 13 ( used for multiplication factor 6.5).
 
 config CLOCK_STM32_PLL_PREDIV1
 	int "PREDIV1 Prescaler"
@@ -30,6 +30,6 @@
 	default 1
 	range 1 16
 	help
-	 PREDIV1 is PLL clock signal prescaler, allowed values: 1 - 16.
+	  PREDIV1 is PLL clock signal prescaler, allowed values: 1 - 16.
 
 endif # SOC_SERIES_STM32F1X
diff --git a/drivers/clock_control/Kconfig.stm32f2_f4_f7 b/drivers/clock_control/Kconfig.stm32f2_f4_f7
index 71347f4..ff7fba1 100644
--- a/drivers/clock_control/Kconfig.stm32f2_f4_f7
+++ b/drivers/clock_control/Kconfig.stm32f2_f4_f7
@@ -13,10 +13,10 @@
 	default 8
 	range 2 63
 	help
-	 PLLM division factor needs to be set correctly to ensure that the VCO
-	 input frequency ranges from 1 to 2 MHz. It is recommended to select a
-	 frequency of 2 MHz to limit PLL jitter.
-	 Allowed values: 2-63
+	  PLLM division factor needs to be set correctly to ensure that the VCO
+	  input frequency ranges from 1 to 2 MHz. It is recommended to select a
+	  frequency of 2 MHz to limit PLL jitter.
+	  Allowed values: 2-63
 
 config CLOCK_STM32_PLL_N_MULTIPLIER
 	int "Multiplier factor for PLL VCO output clock"
@@ -25,10 +25,10 @@
 	range 192 432 if SOC_STM32F401XE || SOC_SERIES_STM32F2X
 	range 50 432
 	help
-	 PLLN multiplier factor needs to be set correctly to ensure that the
-	 VCO output frequency is between 100 and 432 MHz, except on STM32F401
-	 where the frequency must be between 192 and 432 MHz.
-	 Allowed values: 50-432 (STM32F401: 192-432)
+	  PLLN multiplier factor needs to be set correctly to ensure that the
+	  VCO output frequency is between 100 and 432 MHz, except on STM32F401
+	  where the frequency must be between 192 and 432 MHz.
+	  Allowed values: 50-432 (STM32F401: 192-432)
 
 config CLOCK_STM32_PLL_P_DIVISOR
 	int "PLL division factor for main system clock"
@@ -36,8 +36,8 @@
 	default 4
 	range 2 8
 	help
-	 PLLP division factor needs to be set correctly to not exceed 84MHz.
-	 Allowed values: 2, 4, 6, 8
+	  PLLP division factor needs to be set correctly to not exceed 84MHz.
+	  Allowed values: 2, 4, 6, 8
 
 config CLOCK_STM32_PLL_Q_DIVISOR
 	int "Division factor for OTG FS, SDIO and RNG clocks"
@@ -45,8 +45,8 @@
 	default 7
 	range 2 15
 	help
-	 The USB OTG FS requires a 48MHz clock to work correctly. SDIO and RNG
-	 need a frequency lower than or equal to 48 MHz to work correctly.
-	 Allowed values: 2-15
+	  The USB OTG FS requires a 48MHz clock to work correctly. SDIO and RNG
+	  need a frequency lower than or equal to 48 MHz to work correctly.
+	  Allowed values: 2-15
 
 endif # SOC_SERIES_STM32F2X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X
diff --git a/drivers/clock_control/Kconfig.stm32g0 b/drivers/clock_control/Kconfig.stm32g0
index 0b500a1..0084c7b 100644
--- a/drivers/clock_control/Kconfig.stm32g0
+++ b/drivers/clock_control/Kconfig.stm32g0
@@ -13,8 +13,8 @@
 	default 8
 	range 8 86
 	help
-	 PLL multiplier, allowed values: 8-86
-	 PLL output must not exceed 56MHz(1.8V)/26MHz(1.2V).
+	  PLL multiplier, allowed values: 8-86
+	  PLL output must not exceed 56MHz(1.8V)/26MHz(1.2V).
 
 config CLOCK_STM32_PLL_M_DIVISOR
 	int "PLL divisor"
diff --git a/drivers/clock_control/Kconfig.stm32l0_l1 b/drivers/clock_control/Kconfig.stm32l0_l1
index 171682c..1bb0155 100644
--- a/drivers/clock_control/Kconfig.stm32l0_l1
+++ b/drivers/clock_control/Kconfig.stm32l0_l1
@@ -13,8 +13,8 @@
 	default 4
 	range 3 48
 	help
-	 PLL multiplier, allowed values: 3, 4, 6, 8, 12, 16, 24, 32, 48.
-	 PLL output must not exceed 96MHz(1.8V)/48MHz(1.5V)/24MHz(1.2V).
+	  PLL multiplier, allowed values: 3, 4, 6, 8, 12, 16, 24, 32, 48.
+	  PLL output must not exceed 96MHz(1.8V)/48MHz(1.5V)/24MHz(1.2V).
 
 config CLOCK_STM32_PLL_DIVISOR
 	int "PLL divisor"
diff --git a/drivers/console/Kconfig b/drivers/console/Kconfig
index 0550fb6..3a7b168 100644
--- a/drivers/console/Kconfig
+++ b/drivers/console/Kconfig
@@ -179,7 +179,7 @@
 	  thread to print out incoming messages from the remote CPU. Specify the
 	  stack size for these threads here.
 
-config	UART_PIPE
+config UART_PIPE
 	bool "Enable pipe UART driver"
 	select UART_INTERRUPT_DRIVEN
 	help
diff --git a/drivers/display/Kconfig.dummy b/drivers/display/Kconfig.dummy
index 2918402..69cd06e 100644
--- a/drivers/display/Kconfig.dummy
+++ b/drivers/display/Kconfig.dummy
@@ -25,4 +25,4 @@
 	int "Y resolution for dummy display"
 	default 240
 
-endif #DUMMY_DISPLAY
+endif # DUMMY_DISPLAY
diff --git a/drivers/display/Kconfig.ili9340 b/drivers/display/Kconfig.ili9340
index 2809e47..c2329c4 100644
--- a/drivers/display/Kconfig.ili9340
+++ b/drivers/display/Kconfig.ili9340
@@ -10,7 +10,7 @@
 	bool "ILI9340 display driver"
 	depends on SPI
 	help
-	Enable driver for ILI9340 display driver.
+	  Enable driver for ILI9340 display driver.
 
 if ILI9340
 
@@ -18,7 +18,7 @@
 	prompt "LCD"
 	default ILI9340_LCD_ADAFRUIT_1480
 	help
-	Specify the type of LCD connected to the ILI9340 display controller.
+	  Specify the type of LCD connected to the ILI9340 display controller.
 
 config ILI9340_LCD_ADAFRUIT_1480
 	bool "Adafruit 2.2\" TFT 1480"
@@ -31,7 +31,7 @@
 choice
 	prompt "Color pixel format"
 	help
-	Specify the color pixel format of the ILI9340 display controller.
+	  Specify the color pixel format of the ILI9340 display controller.
 
 config ILI9340_RGB888
 	bool "RGB888"
@@ -41,4 +41,4 @@
 
 endchoice
 
-endif #ILI9340
+endif # ILI9340
diff --git a/drivers/display/Kconfig.ssd1306 b/drivers/display/Kconfig.ssd1306
index cfd7048..0239769 100644
--- a/drivers/display/Kconfig.ssd1306
+++ b/drivers/display/Kconfig.ssd1306
@@ -40,4 +40,4 @@
 	help
 	  SSD16XX reverse video mode.
 
-endif #SSD1306
+endif # SSD1306
diff --git a/drivers/display/Kconfig.st7789v b/drivers/display/Kconfig.st7789v
index 71fea4d..342910f 100644
--- a/drivers/display/Kconfig.st7789v
+++ b/drivers/display/Kconfig.st7789v
@@ -63,6 +63,6 @@
 	help
 	  Address pixels from bottom to top.
 
-endif #ST7789V_RGB565
+endif # ST7789V_RGB565
 
-endif #ST7789V
+endif # ST7789V
diff --git a/drivers/dma/Kconfig.sam0 b/drivers/dma/Kconfig.sam0
index 9cd0471..19556d5 100644
--- a/drivers/dma/Kconfig.sam0
+++ b/drivers/dma/Kconfig.sam0
@@ -8,4 +8,4 @@
 	default y
 	depends on SOC_FAMILY_SAM0
 	help
-	DMA driver for Atmel SAM0 series MCUs.
+	  DMA driver for Atmel SAM0 series MCUs.
diff --git a/drivers/ethernet/Kconfig.enc28j60 b/drivers/ethernet/Kconfig.enc28j60
index 9e477cc..a66adc0 100644
--- a/drivers/ethernet/Kconfig.enc28j60
+++ b/drivers/ethernet/Kconfig.enc28j60
@@ -55,7 +55,7 @@
 config ETH_ENC28J60_0_GPIO_SPI_CS
 	bool "Manage SPI CS through a GPIO pin"
 	help
-	This option is useful if one needs to manage SPI CS through a GPIO
-	pin to by-pass the SPI controller's CS logic.
+	  This option is useful if one needs to manage SPI CS through a GPIO
+	  pin to by-pass the SPI controller's CS logic.
 
-endif #ETH_ENC28J60 && ETH_ENC28J60_0
+endif # ETH_ENC28J60 && ETH_ENC28J60_0
diff --git a/drivers/ethernet/Kconfig.mcux b/drivers/ethernet/Kconfig.mcux
index 5c40cb9..060d79c 100644
--- a/drivers/ethernet/Kconfig.mcux
+++ b/drivers/ethernet/Kconfig.mcux
@@ -52,7 +52,7 @@
 config ETH_MCUX_0
 	bool "MCUX Ethernet port 0"
 	help
-	 Include port 0 driver
+	  Include port 0 driver
 
 choice ETH_MCUX_0_MAC_SELECT
 	prompt "MAC address"
diff --git a/drivers/ethernet/Kconfig.native_posix b/drivers/ethernet/Kconfig.native_posix
index ac54091..8344a0f 100644
--- a/drivers/ethernet/Kconfig.native_posix
+++ b/drivers/ethernet/Kconfig.native_posix
@@ -104,7 +104,7 @@
 
 if ! ETH_NATIVE_POSIX_RANDOM_MAC
 
-config	ETH_NATIVE_POSIX_MAC_ADDR
+config ETH_NATIVE_POSIX_MAC_ADDR
 	string "MAC address for the interface"
 	default ""
 	help
diff --git a/drivers/ethernet/Kconfig.stm32_hal b/drivers/ethernet/Kconfig.stm32_hal
index 2b1acd8..d3d3449 100644
--- a/drivers/ethernet/Kconfig.stm32_hal
+++ b/drivers/ethernet/Kconfig.stm32_hal
@@ -11,7 +11,7 @@
 	select USE_STM32_HAL_ETH
 	help
 	  Enable STM32 HAL based Ethernet driver. It is available for
-          all Ethernet enabled variants of the F2, F4 and F7 series.
+	  all Ethernet enabled variants of the F2, F4 and F7 series.
 
 if ETH_STM32_HAL
 
@@ -90,10 +90,10 @@
 
 config ETH_STM32_CARRIER_CHECK_RX_IDLE_TIMEOUT_MS
 	int "Carrier check timeout period (ms)"
- 	default 500
- 	range 100 30000
- 	help
- 	  Set the RX idle timeout period in milliseconds after which the
+	default 500
+	range 100 30000
+	help
+	  Set the RX idle timeout period in milliseconds after which the
 	  PHY's carrier status is re-evaluated.
 
 endif # ETH_STM32_HAL
diff --git a/drivers/flash/Kconfig.nor b/drivers/flash/Kconfig.nor
index 645aadb..dbb4789 100644
--- a/drivers/flash/Kconfig.nor
+++ b/drivers/flash/Kconfig.nor
@@ -24,7 +24,7 @@
 	int "Delay time in us"
 	default 0
 	help
-	This is the wait delay (in us) to allow for CS switching to take effect
+	  This is the wait delay (in us) to allow for CS switching to take effect
 
 config SPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 	int "Page size to use for FLASH_LAYOUT feature"
diff --git a/drivers/flash/Kconfig.sam b/drivers/flash/Kconfig.sam
index 0ce67a3..e01c8b7 100644
--- a/drivers/flash/Kconfig.sam
+++ b/drivers/flash/Kconfig.sam
@@ -11,6 +11,6 @@
 	select FLASH_HAS_PAGE_LAYOUT
 	select FLASH_HAS_DRIVER_ENABLED
 	help
-	 Enable the Atmel SAM series internal flash driver.
+	  Enable the Atmel SAM series internal flash driver.
 
 endif
diff --git a/drivers/flash/Kconfig.sam0 b/drivers/flash/Kconfig.sam0
index bf3d877..0f7b842 100644
--- a/drivers/flash/Kconfig.sam0
+++ b/drivers/flash/Kconfig.sam0
@@ -11,13 +11,13 @@
 	select FLASH_HAS_PAGE_LAYOUT
 	select FLASH_HAS_DRIVER_ENABLED
 	help
-	 Enable the Atmel SAM0 series internal flash driver.
+	  Enable the Atmel SAM0 series internal flash driver.
 
 config SOC_FLASH_SAM0_EMULATE_BYTE_PAGES
 	bool "Emulate byte-sized pages"
 	depends on SOC_FLASH_SAM0
 	help
-	 Emulate a device with byte-sized pages by doing a
-	 read/modify/erase/write.  Needed for NFFS.
+	  Emulate a device with byte-sized pages by doing a
+	  read/modify/erase/write.  Needed for NFFS.
 
 endif
diff --git a/drivers/flash/Kconfig.stm32 b/drivers/flash/Kconfig.stm32
index c1d2d39..7e6ada0 100644
--- a/drivers/flash/Kconfig.stm32
+++ b/drivers/flash/Kconfig.stm32
@@ -30,6 +30,7 @@
 	select FLASH_HAS_PAGE_LAYOUT if SOC_SERIES_STM32WBX
 	select FLASH_HAS_PAGE_LAYOUT if SOC_SERIES_STM32G4X
 	help
-	 Enable STM32F0x, STM32F3x, STM32F4x, STM32F7x, STM32L4x, STM32WBx, STM32G0x or STM32G4x series flash driver.
+	  Enable STM32F0x, STM32F3x, STM32F4x, STM32F7x, STM32L4x, STM32WBx,
+	  STM32G0x or STM32G4x series flash driver.
 
 endif
diff --git a/drivers/flash/Kconfig.w25qxxdv b/drivers/flash/Kconfig.w25qxxdv
index 063985a..be31859 100644
--- a/drivers/flash/Kconfig.w25qxxdv
+++ b/drivers/flash/Kconfig.w25qxxdv
@@ -27,15 +27,15 @@
 config SPI_FLASH_W25QXXDV_GPIO_SPI_CS
 	bool "Manage SPI CS through a GPIO pin"
 	help
-	This option is useful if one needs to manage SPI CS through a GPIO
-	pin to by-pass the SPI controller's CS logic.
+	  This option is useful if one needs to manage SPI CS through a GPIO
+	  pin to by-pass the SPI controller's CS logic.
 
 config SPI_FLASH_W25QXXDV_GPIO_CS_WAIT_DELAY
 	int "Delay time in us"
 	default 0
-        depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
+	depends on SPI_FLASH_W25QXXDV_GPIO_SPI_CS
 	help
-	This is the wait delay (in us) to allow for CS switching to take effect
+	  This is the wait delay (in us) to allow for CS switching to take effect
 
 config SPI_FLASH_W25QXXDV_FLASH_SIZE
 	int "Flash size in bytes"
@@ -48,7 +48,7 @@
 	default 0x00ef4015
 	help
 	  This is the device ID of the flash chip to use, which is 0x00ef4015 for
-          the W25QXXDV
+	  the W25QXXDV
 
 config SPI_FLASH_W25QXXDV_PAGE_PROGRAM_SIZE
 	int "Page Program Size in bytes"
diff --git a/drivers/gpio/Kconfig.xec b/drivers/gpio/Kconfig.xec
index 7e8277b..026bae8 100644
--- a/drivers/gpio/Kconfig.xec
+++ b/drivers/gpio/Kconfig.xec
@@ -10,39 +10,38 @@
 	depends on SOC_FAMILY_MEC
 	select HAS_DTS_GPIO
 	help
-	Enable the Microchip XEC gpio driver.
+	  Enable the Microchip XEC gpio driver.
 
 if GPIO_XEC
 
 config GPIO_XEC_GPIO000_036
 	bool "GPIO 000-036"
 	help
-	Enable GPIO 000-036 or what would be equivalent to PortA.
+	  Enable GPIO 000-036 or what would be equivalent to PortA.
 
 config GPIO_XEC_GPIO040_076
 	bool "GPIO 040-036"
 	help
-	Enable GPIO 040-076 or what would be equivalent to Port B
+	  Enable GPIO 040-076 or what would be equivalent to Port B
 
 config GPIO_XEC_GPIO100_136
 	bool "GPIO 100-136"
 	help
-	Enable GPIO 100-136 or what would be equivalent to Port C
+	  Enable GPIO 100-136 or what would be equivalent to Port C
 
 config GPIO_XEC_GPIO140_176
 	bool "GPIO 140-176"
 	help
-	Enable GPIO 140-176 or what would be equivalent to Port C
+	  Enable GPIO 140-176 or what would be equivalent to Port C
 
 config GPIO_XEC_GPIO200_236
 	bool "GPIO 200-236"
 	help
-	Enable GPIO 200-236 or what would be equivalent to Port D
+	  Enable GPIO 200-236 or what would be equivalent to Port D
 
 config GPIO_XEC_GPIO240_276
 	bool "GPIO 240-276"
 	help
-	Enable GPIO 240-276 or what would be equivalent to Port E
+	  Enable GPIO 240-276 or what would be equivalent to Port E
 
 endif # GPIO_XEC
-
diff --git a/drivers/i2c/Kconfig.nrfx b/drivers/i2c/Kconfig.nrfx
index 81c2c7c..d98d5cb 100644
--- a/drivers/i2c/Kconfig.nrfx
+++ b/drivers/i2c/Kconfig.nrfx
@@ -117,4 +117,4 @@
 
 endif # I2C_3 && !SPI_3 && !(SOC_SERIES_NRF91X && UART_3_NRF_UARTE)
 
-endif #I2C_NRFX
+endif # I2C_NRFX
diff --git a/drivers/i2c/Kconfig.xec b/drivers/i2c/Kconfig.xec
index bb40968..f864033 100644
--- a/drivers/i2c/Kconfig.xec
+++ b/drivers/i2c/Kconfig.xec
@@ -9,7 +9,7 @@
 	bool "XEC Microchip I2C driver"
 	depends on SOC_FAMILY_MEC
 	help
-	Enable the Microchip XEC I2C driver.
+	  Enable the Microchip XEC I2C driver.
 
 if I2C_XEC
 
@@ -31,4 +31,4 @@
 	  This tells the driver to configure the I2C device at boot, depending
 	  on the additional configuration options below.
 
-endif #I2C_XEC
+endif # I2C_XEC
diff --git a/drivers/ieee802154/Kconfig.cc2520 b/drivers/ieee802154/Kconfig.cc2520
index 531fa80..a81020a 100644
--- a/drivers/ieee802154/Kconfig.cc2520
+++ b/drivers/ieee802154/Kconfig.cc2520
@@ -21,8 +21,8 @@
 config IEEE802154_CC2520_GPIO_SPI_CS
 	bool "Manage SPI CS through a GPIO pin"
 	help
-	This option is useful if one needs to manage SPI CS through a GPIO
-	pin to by-pass the SPI controller's CS logic.
+	  This option is useful if one needs to manage SPI CS through a GPIO
+	  pin to by-pass the SPI controller's CS logic.
 
 config IEEE802154_CC2520_RX_STACK_SIZE
 	int "Driver's internal RX thread stack size"
diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig
index 67b1032..53d7d8c 100644
--- a/drivers/interrupt_controller/Kconfig
+++ b/drivers/interrupt_controller/Kconfig
@@ -76,7 +76,7 @@
 	  when the OS starts up, or a previous boot stage has done some IOAPIC
 	  configuration that needs to be preserved.
 
-endif #LOAPIC
+endif # LOAPIC
 
 config ARCV2_INTERRUPT_UNIT
 	bool "ARCv2 Interrupt Unit"
diff --git a/drivers/interrupt_controller/Kconfig.sam0 b/drivers/interrupt_controller/Kconfig.sam0
index 72da7a4..a281e5b 100644
--- a/drivers/interrupt_controller/Kconfig.sam0
+++ b/drivers/interrupt_controller/Kconfig.sam0
@@ -11,7 +11,7 @@
 	bool "External Interrupt Controller (EIC) Driver for SAM0 series devices"
 	default y
 	help
-	 Enable EIC driver for SAM0 series of devices.  This is required for
-	 GPIO interrupt support.
+	  Enable EIC driver for SAM0 series of devices.  This is required for
+	  GPIO interrupt support.
 
 endif # SOC_FAMILY_SAM0
diff --git a/drivers/interrupt_controller/Kconfig.shared_irq b/drivers/interrupt_controller/Kconfig.shared_irq
index 74b650d..ba11257 100644
--- a/drivers/interrupt_controller/Kconfig.shared_irq
+++ b/drivers/interrupt_controller/Kconfig.shared_irq
@@ -9,36 +9,36 @@
 menuconfig SHARED_IRQ
 	bool "Shared interrupt driver"
 	help
-	 Include shared interrupt support in system. Shared interrupt
-	 support is NOT required in most systems. If in doubt answer no.
+	  Include shared interrupt support in system. Shared interrupt
+	  support is NOT required in most systems. If in doubt answer no.
 
 config SHARED_IRQ_NUM_CLIENTS
 	int "The number of clients per instance"
 	depends on SHARED_IRQ
 	default 5
 	help
-	 Configures the maximum number of clients allowed per shared
-	 instance of the shared interrupt driver. To conserve RAM set
-	 this value to the lowest practical value.
+	  Configures the maximum number of clients allowed per shared
+	  instance of the shared interrupt driver. To conserve RAM set
+	  this value to the lowest practical value.
 
 config SHARED_IRQ_INIT_PRIORITY
 	int "Shared IRQ init priority"
 	depends on SHARED_IRQ
 	default 45
 	help
-	 Shared IRQ are initialized on POST_KERNEL init level. They
-	 have to be initialized before any device that uses them.
+	  Shared IRQ are initialized on POST_KERNEL init level. They
+	  have to be initialized before any device that uses them.
 
 config SHARED_IRQ_0
 	bool "Shared interrupt instance 0"
 	depends on SHARED_IRQ
 	help
-	 Provide an instance of the shared interrupt driver when system
-	 configuration requires that multiple devices share an interrupt.
+	  Provide an instance of the shared interrupt driver when system
+	  configuration requires that multiple devices share an interrupt.
 
 config SHARED_IRQ_1
 	bool "Shared interrupt instance 1"
 	depends on SHARED_IRQ
 	help
-	 Provide an instance of the shared interrupt driver when system
-	 configuration requires that multiple devices share an interrupt.
+	  Provide an instance of the shared interrupt driver when system
+	  configuration requires that multiple devices share an interrupt.
diff --git a/drivers/interrupt_controller/Kconfig.stm32 b/drivers/interrupt_controller/Kconfig.stm32
index 01b68c6..6eb0338 100644
--- a/drivers/interrupt_controller/Kconfig.stm32
+++ b/drivers/interrupt_controller/Kconfig.stm32
@@ -11,7 +11,7 @@
 	bool "External Interrupt/Event Controller (EXTI) Driver for STM32 family of MCUs"
 	default y if SOC_FAMILY_STM32
 	help
-	 Enable EXTI driver for STM32 line of MCUs
+	  Enable EXTI driver for STM32 line of MCUs
 
 config EXTI_STM32_EXTI1_0_IRQ_PRI
 	int "EXTI1:0 IRQ priority"
@@ -19,7 +19,7 @@
 	depends on SOC_SERIES_STM32F0X || SOC_SERIES_STM32L0X || SOC_SERIES_STM32G0X
 	default 0
 	help
-	 IRQ priority of EXTI1:0 interrupt
+	  IRQ priority of EXTI1:0 interrupt
 
 config EXTI_STM32_EXTI3_2_IRQ_PRI
 	int "EXTI3:2 IRQ priority"
@@ -27,7 +27,7 @@
 	depends on SOC_SERIES_STM32F0X || SOC_SERIES_STM32L0X || SOC_SERIES_STM32G0X
 	default 0
 	help
-	 IRQ priority of EXTI3:2 interrupt
+	  IRQ priority of EXTI3:2 interrupt
 
 config EXTI_STM32_EXTI15_4_IRQ_PRI
 	int "EXTI15:4 IRQ priority"
@@ -35,7 +35,7 @@
 	depends on SOC_SERIES_STM32F0X || SOC_SERIES_STM32L0X || SOC_SERIES_STM32G0X
 	default 0
 	help
-	 IRQ priority of EXTI15:4 interrupt
+	  IRQ priority of EXTI15:4 interrupt
 
 if SOC_SERIES_STM32F0X!=y && SOC_SERIES_STM32L0X!=y && SOC_SERIES_STM32G0X!=y
 
@@ -44,35 +44,35 @@
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI0 interrupt
+	  IRQ priority of EXTI0 interrupt
 
 config EXTI_STM32_EXTI1_IRQ_PRI
 	int "EXTI1 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI1 interrupt
+	  IRQ priority of EXTI1 interrupt
 
 config EXTI_STM32_EXTI2_IRQ_PRI
 	int "EXTI2 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI2 interrupt
+	  IRQ priority of EXTI2 interrupt
 
 config EXTI_STM32_EXTI3_IRQ_PRI
 	int "EXTI3 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI3 interrupt
+	  IRQ priority of EXTI3 interrupt
 
 config EXTI_STM32_EXTI4_IRQ_PRI
 	int "EXTI4 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI4 interrupt
+	  IRQ priority of EXTI4 interrupt
 
 if SOC_SERIES_STM32MP1X
 config EXTI_STM32_EXTI5_IRQ_PRI
@@ -80,77 +80,77 @@
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI5 interrupt
+	  IRQ priority of EXTI5 interrupt
 
 config EXTI_STM32_EXTI6_IRQ_PRI
 	int "EXTI6 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI6 interrupt
+	  IRQ priority of EXTI6 interrupt
 
 config EXTI_STM32_EXTI7_IRQ_PRI
 	int "EXTI7 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI7 interrupt
+	  IRQ priority of EXTI7 interrupt
 
 config EXTI_STM32_EXTI8_IRQ_PRI
 	int "EXTI8 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI8 interrupt
+	  IRQ priority of EXTI8 interrupt
 
 config EXTI_STM32_EXTI9_IRQ_PRI
 	int "EXTI9 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI9 interrupt
+	  IRQ priority of EXTI9 interrupt
 
 config EXTI_STM32_EXTI10_IRQ_PRI
 	int "EXTI10 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI10 interrupt
+	  IRQ priority of EXTI10 interrupt
 
 config EXTI_STM32_EXTI11_IRQ_PRI
 	int "EXTI11 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI11 interrupt
+	  IRQ priority of EXTI11 interrupt
 
 config EXTI_STM32_EXTI12_IRQ_PRI
 	int "EXTI12 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI12 interrupt
+	  IRQ priority of EXTI12 interrupt
 
 config EXTI_STM32_EXTI13_IRQ_PRI
 	int "EXTI13 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI13 interrupt
+	  IRQ priority of EXTI13 interrupt
 
 config EXTI_STM32_EXTI14_IRQ_PRI
 	int "EXTI14 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI14 interrupt
+	  IRQ priority of EXTI14 interrupt
 
 config EXTI_STM32_EXTI15_IRQ_PRI
 	int "EXTI15 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI15 interrupt
+	  IRQ priority of EXTI15 interrupt
 
 endif # SOC_SERIES_STM32MP1X
 
@@ -160,14 +160,14 @@
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI9:5 interrupt
+	  IRQ priority of EXTI9:5 interrupt
 
 config EXTI_STM32_EXTI15_10_IRQ_PRI
 	int "EXTI15:10 IRQ priority"
 	depends on EXTI_STM32
 	default 0
 	help
-	 IRQ priority of EXTI15:10 interrupt
+	  IRQ priority of EXTI15:10 interrupt
 endif # SOC_SERIES_STM32MP1X!=y
 
 endif # SOC_SERIES_STM32F0X!=y && SOC_SERIES_STM32L0X!=y && SOC_SERIES_STM32G0X!=y
@@ -178,7 +178,7 @@
 	depends on SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32F2X || SOC_SERIES_STM32G0X
 	default 0
 	help
-	 IRQ priority of RVD Through interrupt
+	  IRQ priority of RVD Through interrupt
 
 config EXTI_STM32_OTG_FS_WKUP_IRQ_PRI
 	int "USB OTG FS Wake Up IRQ priority"
@@ -186,7 +186,7 @@
 	depends on SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32F2X
 	default 0
 	help
-	 IRQ priority of USB OTG FS Wake interrupt
+	  IRQ priority of USB OTG FS Wake interrupt
 
 config EXTI_STM32_TAMP_STAMP_IRQ_PRI
 	int "Tamper and Timestamp IRQ priority"
@@ -194,7 +194,7 @@
 	depends on SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32F2X
 	default 0
 	help
-	 IRQ priority of Tamper and Timestamp interrupt
+	  IRQ priority of Tamper and Timestamp interrupt
 
 config EXTI_STM32_RTC_WKUP_IRQ_PRI
 	int "RTC Wake Up IRQ priority"
@@ -202,7 +202,7 @@
 	depends on SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32F2X
 	default 0
 	help
-	 IRQ priority of RTC Wake Up interrupt
+	  IRQ priority of RTC Wake Up interrupt
 
 config EXTI_STM32_LPTIM1_IRQ_PRI
 	int "LPTIM1 IRQ priority"
@@ -210,6 +210,6 @@
 	depends on SOC_SERIES_STM32F7X
 	default 0
 	help
-	 IRQ priority of LPTIM1 interrupt
+	  IRQ priority of LPTIM1 interrupt
 
 endif # SOC_FAMILY_STM32
diff --git a/drivers/kscan/Kconfig b/drivers/kscan/Kconfig
index 22a1063..7822077 100644
--- a/drivers/kscan/Kconfig
+++ b/drivers/kscan/Kconfig
@@ -25,4 +25,4 @@
 	help
 	  Keyboard scan device driver initialization priority.
 
-endif #KSCAN
+endif # KSCAN
diff --git a/drivers/kscan/Kconfig.xec b/drivers/kscan/Kconfig.xec
index 2b2041f..b59fd74 100644
--- a/drivers/kscan/Kconfig.xec
+++ b/drivers/kscan/Kconfig.xec
@@ -18,32 +18,32 @@
 	int "KSCAN_XEC_COLUMN_SIZE"
 	default 16
 	help
-	 Adjust the value to your keyboard columns. The maximum
-	 column size for the Microchip XEC family is 18 (from 0 to 17).
+	  Adjust the value to your keyboard columns. The maximum
+	  column size for the Microchip XEC family is 18 (from 0 to 17).
 
 config KSCAN_XEC_ROW_SIZE
 	int "KSCAN_XEC_ROW_SIZE"
 	default 8
 	help
-	 Adjust the value to your keyboard rows. The maximum
-	 column size for the Microchip XEC family is 8 (from 0 to 7).
+	  Adjust the value to your keyboard rows. The maximum
+	  column size for the Microchip XEC family is 8 (from 0 to 7).
 
 config KSCAN_XEC_DEBOUNCE_DOWN
 	int "KSCAN_XEC_DEBOUNCE_DOWN"
 	default 10
 	help
-	 Determines the time in msecs for debouncing a key press.
+	  Determines the time in msecs for debouncing a key press.
 
 config KSCAN_XEC_DEBOUNCE_UP
 	int "KSCAN_XEC_DEBOUNCE_UP"
 	default 20
 	help
-	 Determines the time in msecs for debouncing a key release.
+	  Determines the time in msecs for debouncing a key release.
 
 config KSCAN_XEC_POLL_PERIOD
 	int "KSCAN_XEC_POLL_PERIOD"
 	default 5
 	help
-	 Defines the poll period in msecs between between matrix scans.
+	  Defines the poll period in msecs between between matrix scans.
 
-endif #KSCAN_XEC
+endif # KSCAN_XEC
diff --git a/drivers/led/Kconfig.ht16k33 b/drivers/led/Kconfig.ht16k33
index c2a0da4..0005d43 100644
--- a/drivers/led/Kconfig.ht16k33
+++ b/drivers/led/Kconfig.ht16k33
@@ -56,4 +56,4 @@
 	  Keyscan poll interval in milliseconds. Polling is only used
 	  if no interrupt line is present.
 
-endif #HT16K33_KEYSCAN
+endif # HT16K33_KEYSCAN
diff --git a/drivers/led_strip/Kconfig b/drivers/led_strip/Kconfig
index 77c70ba..7e6a1fd 100644
--- a/drivers/led_strip/Kconfig
+++ b/drivers/led_strip/Kconfig
@@ -10,7 +10,7 @@
 menuconfig LED_STRIP
 	bool "LED strip drivers"
 	help
-		Include LED strip drivers in the system configuration.
+	  Include LED strip drivers in the system configuration.
 
 if LED_STRIP
 
diff --git a/drivers/led_strip/Kconfig.apa102 b/drivers/led_strip/Kconfig.apa102
index 25e6a72..113d750 100644
--- a/drivers/led_strip/Kconfig.apa102
+++ b/drivers/led_strip/Kconfig.apa102
@@ -9,5 +9,5 @@
 	depends on SPI
 	select LED_STRIP_RGB_SCRATCH
 	help
-	 Enable the LED strip driver for a chain of APA102 RGB LEDs.
-	 These are sold as DotStar by Adafruit and Superled by others.
+	  Enable the LED strip driver for a chain of APA102 RGB LEDs.
+	  These are sold as DotStar by Adafruit and Superled by others.
diff --git a/drivers/led_strip/Kconfig.lpd880x b/drivers/led_strip/Kconfig.lpd880x
index a48a2d7..7b173c3 100644
--- a/drivers/led_strip/Kconfig.lpd880x
+++ b/drivers/led_strip/Kconfig.lpd880x
@@ -8,12 +8,12 @@
 	bool "Enable LPD880x SPI LED strip driver"
 	depends on SPI
 	help
-		Enable LED strip driver for daisy chains of LPD880x
-		(LPD8803, LPD8806, or compatible) devices.
+	  Enable LED strip driver for daisy chains of LPD880x
+	  (LPD8803, LPD8806, or compatible) devices.
 
-		Each LPD880x LED driver chip has some output channels
-		(3 channels for LPD8803, 6 for LPD8806), whose PWM
-		duty cycle can be set at 7 bit resolution via a
-		reduced SPI interface (MOSI and CLK lines only).
-		Each chip also includes data and clock out pins for
-		daisy chaining LED strips.
+	  Each LPD880x LED driver chip has some output channels
+	  (3 channels for LPD8803, 6 for LPD8806), whose PWM
+	  duty cycle can be set at 7 bit resolution via a
+	  reduced SPI interface (MOSI and CLK lines only).
+	  Each chip also includes data and clock out pins for
+	  daisy chaining LED strips.
diff --git a/drivers/led_strip/Kconfig.ws2812 b/drivers/led_strip/Kconfig.ws2812
index aa64d5d..6987cff 100644
--- a/drivers/led_strip/Kconfig.ws2812
+++ b/drivers/led_strip/Kconfig.ws2812
@@ -12,14 +12,14 @@
 	bool "Enable WS2812 (and compatible) LED strip driver"
 	depends on SPI
 	help
-		Enable LED strip driver for daisy chains of WS2812-ish
-		(or WS2812B, WS2813, SK6812, or compatible) devices.
-		These devices have a one-wire communications interface
-		which encodes bits using pulses. Short pulses indicate
-		zero bits, and long pulses indicate ones; refer to the
-		chip datasheets for precise specifications. To implement
-		this in a multitasking operating system, this driver
-		generates the pulses using a SPI peripheral.
+	  Enable LED strip driver for daisy chains of WS2812-ish
+	  (or WS2812B, WS2813, SK6812, or compatible) devices.
+	  These devices have a one-wire communications interface
+	  which encodes bits using pulses. Short pulses indicate
+	  zero bits, and long pulses indicate ones; refer to the
+	  chip datasheets for precise specifications. To implement
+	  this in a multitasking operating system, this driver
+	  generates the pulses using a SPI peripheral.
 
 if WS2812_STRIP
 
@@ -27,33 +27,33 @@
 	int "Maximum number of pixels in a strip"
 	default 12
 	help
-		Set this to the maximum number of pixels you need
-		to control at once. There is an 8x memory penalty associated
-		with each increment of this value, so it's worth optimizing.
+	  Set this to the maximum number of pixels you need
+	  to control at once. There is an 8x memory penalty associated
+	  with each increment of this value, so it's worth optimizing.
 
 config WS2812_STRIP_ONE_FRAME
 	hex "SPI frame to shift out to signal a one bit"
 	default 0x7c if SOC_SERIES_STM32F4X
 	default 0x70 if SOC_FAMILY_NRF
 	help
-		When shifted out at the configured clock frequency,
-		this must generate a pulse whose width fits within the chipset
-		specifications for T1H, and whose interpulse timing meets low
-		times. It is recommended that the first and last bits in the
-		frame be zero; this "encourages" SPI IPs to leave MOSI low
-		between frames.
+	  When shifted out at the configured clock frequency,
+	  this must generate a pulse whose width fits within the chipset
+	  specifications for T1H, and whose interpulse timing meets low
+	  times. It is recommended that the first and last bits in the
+	  frame be zero; this "encourages" SPI IPs to leave MOSI low
+	  between frames.
 
 config WS2812_STRIP_ZERO_FRAME
 	hex "SPI frame to shift out to signal a zero bit"
 	default 0x60 if SOC_SERIES_STM32F4X
 	default 0x40 if SOC_FAMILY_NRF
 	help
-		When shifted out at the configured clock frequency,
-		this must generate a pulse whose width fits within the chipset
-		specifications for T0H, and whose interpulse timing meets low
-		times. It is recommended that the first and last bits in the
-		frame be zero; this "encourages" SPI IPs to leave MOSI low
-		between frames.
+	  When shifted out at the configured clock frequency,
+	  this must generate a pulse whose width fits within the chipset
+	  specifications for T0H, and whose interpulse timing meets low
+	  times. It is recommended that the first and last bits in the
+	  frame be zero; this "encourages" SPI IPs to leave MOSI low
+	  between frames.
 
 # By default, we use GRBW [sic] (and ignore W).
 comment "The following options determine channel data order on the wire."
@@ -63,32 +63,32 @@
 	default 1
 	range 0 3
 	help
-		If the red channel is shifted out first, specify 0.
-		If second, specify 1, and so on.
+	  If the red channel is shifted out first, specify 0.
+	  If second, specify 1, and so on.
 
 config WS2812_GRN_ORDER
 	int "Order in which a green pixel should be shifted out"
 	default 0
 	range 0 3
 	help
-		If the green channel is shifted out first, specify 0.
-		If second, specify 1, and so on.
+	  If the green channel is shifted out first, specify 0.
+	  If second, specify 1, and so on.
 
 config WS2812_BLU_ORDER
 	int "Order in which a blue pixel should be shifted out"
 	default 2
 	range 0 3
 	help
-		If the blue channel is shifted out first, specify 0.
-		If second, specify 1, and so on.
+	  If the blue channel is shifted out first, specify 0.
+	  If second, specify 1, and so on.
 
 config WS2812_HAS_WHITE_CHANNEL
 	bool "Does the chip have a white channel on wire?"
 	default y
 	help
-		If the chipset has a white channel, say y. White channels
-		are not used by the driver, but must be declared if expected
-		by the chip.
+	  If the chipset has a white channel, say y. White channels
+	  are not used by the driver, but must be declared if expected
+	  by the chip.
 
 config WS2812_WHT_ORDER
 	int "Order in which a white pixel should be shifted out"
@@ -96,7 +96,7 @@
 	range 0 3
 	depends on WS2812_HAS_WHITE_CHANNEL
 	help
-		If the blue channel is shifted out first, specify 0.
-		If second, specify 1, and so on.
+	  If the blue channel is shifted out first, specify 0.
+	  If second, specify 1, and so on.
 
 endif # WS2812_STRIP
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 649c863..ef92832 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -34,7 +34,7 @@
 	  to disable this as it takes some time to verify the received
 	  packet.
 
-config	PPP_MAC_ADDR
+config PPP_MAC_ADDR
 	string "MAC address for the interface"
 	help
 	  Specify a MAC address for the PPP interface in the form of
@@ -63,7 +63,7 @@
 
 if SLIP
 
-config	SLIP_DRV_NAME
+config SLIP_DRV_NAME
 	string "SLIP Driver name"
 	default "slip"
 	help
@@ -75,7 +75,7 @@
 module-help = Sets log level for slip driver.
 source "subsys/net/Kconfig.template.log_config.net"
 
-config	SLIP_STATISTICS
+config SLIP_STATISTICS
 	bool "SLIP network connection statistics"
 	help
 	  This option enables statistics support for SLIP driver.
@@ -87,8 +87,7 @@
 	help
 	  In TAP the Ethernet frames are transferred over SLIP.
 
-
-config	SLIP_MAC_ADDR
+config SLIP_MAC_ADDR
 	string "MAC address for the interface"
 	help
 	  Specify a MAC address for the SLIP interface in the form of
diff --git a/drivers/pinmux/Kconfig.cc2650 b/drivers/pinmux/Kconfig.cc2650
index fce71d9..c8d5cd8 100644
--- a/drivers/pinmux/Kconfig.cc2650
+++ b/drivers/pinmux/Kconfig.cc2650
@@ -8,9 +8,9 @@
 	depends on GPIO
 	depends on GPIO_CC2650
 	help
-	 Enable pin multiplexer for CC2650 SoC.
+	  Enable pin multiplexer for CC2650 SoC.
 
-	 For hardware reasons, the pinmux depends on the GPIO module
-	 being activated; it must initialize *before* the pinmux does.
-	 Please take care that the pinmux init priority value is *lower*
-	 that the GPIO driver init priority.
+	  For hardware reasons, the pinmux depends on the GPIO module
+	  being activated; it must initialize *before* the pinmux does.
+	  Please take care that the pinmux init priority value is *lower*
+	  that the GPIO driver init priority.
diff --git a/drivers/pinmux/Kconfig.stm32 b/drivers/pinmux/Kconfig.stm32
index 8351c9d..61125f6 100644
--- a/drivers/pinmux/Kconfig.stm32
+++ b/drivers/pinmux/Kconfig.stm32
@@ -9,15 +9,15 @@
 	bool "Pinmux driver for STM32 MCUs"
 	depends on SOC_FAMILY_STM32
 	help
-	 Enable pin multiplexer for STM32 MCUs
+	  Enable pin multiplexer for STM32 MCUs
 
 config PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY
 	int "Device initialization priority STM32 pinmux"
 	depends on PINMUX_STM32
 	default 2
 	help
-	 This option controls the priority of pinmux device initialization.
-	 Higher priority ensures that the device is initialized earlier in
-	 the startup cycle. Note that the pinmux device needs to be initialized
-	 after clock control device, but possibly before all other devices.
-	 If unsure, leave at default value 2
+	  This option controls the priority of pinmux device initialization.
+	  Higher priority ensures that the device is initialized earlier in
+	  the startup cycle. Note that the pinmux device needs to be initialized
+	  after clock control device, but possibly before all other devices.
+	  If unsure, leave at default value 2
diff --git a/drivers/pinmux/Kconfig.xec b/drivers/pinmux/Kconfig.xec
index 2ab4d80..efb7897 100644
--- a/drivers/pinmux/Kconfig.xec
+++ b/drivers/pinmux/Kconfig.xec
@@ -9,14 +9,14 @@
 	bool "XEC Microchip Pinmux driver"
 	depends on SOC_FAMILY_MEC
 	help
-	Enable the Microchip XEC pinmux driver.
+	  Enable the Microchip XEC pinmux driver.
 
 if PINMUX_XEC
 
 config PINMUX_XEC_GPIO000_036
 	bool "Pinmux 000-036"
 	help
-	Enable Port 000-036 or what would be equivalent to Port A.
+	  Enable Port 000-036 or what would be equivalent to Port A.
 
 config PINMUX_XEC_GPIO000_036_NAME
 	string "Pinmux Port 000_036 driver name"
@@ -26,7 +26,7 @@
 config PINMUX_XEC_GPIO040_076
 	bool "Pinmux 040-036"
 	help
-	Enable Port 040-076 or what would be equivalent to Port B
+	  Enable Port 040-076 or what would be equivalent to Port B
 
 config PINMUX_XEC_GPIO040_076_NAME
 	string "Pinmux Port 040_076 driver name"
@@ -36,7 +36,7 @@
 config PINMUX_XEC_GPIO100_136
 	bool "Pinmux 100-136"
 	help
-	Enable Port 100-136 or what would be equivalent to Port C
+	  Enable Port 100-136 or what would be equivalent to Port C
 
 config PINMUX_XEC_GPIO100_136_NAME
 	string "Pinmux Port 100_136 driver name"
@@ -46,7 +46,7 @@
 config PINMUX_XEC_GPIO140_176
 	bool "Pinmux 140-176"
 	help
-	Enable Port 140-176 or what would be equivalent to Port C
+	  Enable Port 140-176 or what would be equivalent to Port C
 
 config PINMUX_XEC_GPIO140_176_NAME
 	string "Pinmux Port 140_176 driver name"
@@ -56,7 +56,7 @@
 config PINMUX_XEC_GPIO200_236
 	bool "Pinmux 200-236"
 	help
-	Enable Port 200-236 or what would be equivalent to Port D
+	  Enable Port 200-236 or what would be equivalent to Port D
 
 config PINMUX_XEC_GPIO200_236_NAME
 	string "Pinmux Port 200_236 driver name"
@@ -66,7 +66,7 @@
 config PINMUX_XEC_GPIO240_276
 	bool "Pinmux 240-276"
 	help
-	Enable Port 240-276 or what would be equivalent to Port E
+	  Enable Port 240-276 or what would be equivalent to Port E
 
 config PINMUX_XEC_GPIO240_276_NAME
 	string "Pinmux Port 200_276 driver name"
@@ -74,4 +74,3 @@
 	default "port200_276"
 
 endif # PINMUX_XEC
-
diff --git a/drivers/ps2/Kconfig b/drivers/ps2/Kconfig
index c20c227..281721c 100644
--- a/drivers/ps2/Kconfig
+++ b/drivers/ps2/Kconfig
@@ -27,4 +27,4 @@
 	  There isn't any critical component relying on this priority at
 	  the moment.
 
-endif #PS2
+endif # PS2
diff --git a/drivers/ps2/Kconfig.xec b/drivers/ps2/Kconfig.xec
index 67b2851e..e0b7172 100644
--- a/drivers/ps2/Kconfig.xec
+++ b/drivers/ps2/Kconfig.xec
@@ -16,11 +16,11 @@
 config PS2_XEC_0
 	bool "PS2_XEC_0"
 	help
-	Enable PS2 0.
+	  Enable PS2 0.
 
 config PS2_XEC_1
 	bool "PS2_XEC_1"
 	help
-	Enable PS2 1.
+	  Enable PS2 1.
 
-endif #PS2_XEC
+endif # PS2_XEC
diff --git a/drivers/sensor/adt7420/Kconfig b/drivers/sensor/adt7420/Kconfig
index 50f6404..280acb5 100644
--- a/drivers/sensor/adt7420/Kconfig
+++ b/drivers/sensor/adt7420/Kconfig
@@ -69,4 +69,4 @@
 	help
 	  Stack size of thread used by the driver to handle interrupts.
 
-endif #ADT7420
+endif # ADT7420
diff --git a/drivers/sensor/adxl372/Kconfig b/drivers/sensor/adxl372/Kconfig
index 848829d..b335cab 100644
--- a/drivers/sensor/adxl372/Kconfig
+++ b/drivers/sensor/adxl372/Kconfig
@@ -220,4 +220,4 @@
 	help
 	  Stack size of thread used by the driver to handle interrupts.
 
-endif #ADXL372
+endif # ADXL372
diff --git a/drivers/sensor/amg88xx/Kconfig b/drivers/sensor/amg88xx/Kconfig
index 1de0fde..67b78e1 100644
--- a/drivers/sensor/amg88xx/Kconfig
+++ b/drivers/sensor/amg88xx/Kconfig
@@ -52,4 +52,4 @@
 	help
 	  Stack size of thread used by the driver to handle interrupts.
 
-endif #if AMG88XX
+endif # AMG88XX
diff --git a/drivers/sensor/ams_iAQcore/Kconfig b/drivers/sensor/ams_iAQcore/Kconfig
index 46c4d42..a28652a 100644
--- a/drivers/sensor/ams_iAQcore/Kconfig
+++ b/drivers/sensor/ams_iAQcore/Kconfig
@@ -18,6 +18,6 @@
 	int "Number of read retries"
 	default 4
 	help
-	 Number of retries when reading failed or device not ready.
+	  Number of retries when reading failed or device not ready.
 
 endif # AMS_IAQ_CORE
diff --git a/drivers/sensor/bme280/Kconfig b/drivers/sensor/bme280/Kconfig
index 9c1f279..cd83842 100644
--- a/drivers/sensor/bme280/Kconfig
+++ b/drivers/sensor/bme280/Kconfig
@@ -11,7 +11,7 @@
 	depends on I2C || SPI
 	default	n
 	help
-	 Enable driver for BME280 I2C-based or SPI-based temperature and pressure sensor.
+	  Enable driver for BME280 I2C-based or SPI-based temperature and pressure sensor.
 
 if BME280
 
diff --git a/drivers/sensor/bme680/Kconfig b/drivers/sensor/bme680/Kconfig
index 8eb2693..bc489b1 100644
--- a/drivers/sensor/bme680/Kconfig
+++ b/drivers/sensor/bme680/Kconfig
@@ -9,7 +9,7 @@
 	bool "BME680 sensor"
 	depends on I2C
 	help
-	 Enable driver for BME680 I2C-based based temperature, pressure, humidity and gas sensor.
+	  Enable driver for BME680 I2C-based based temperature, pressure, humidity and gas sensor.
 
 if BME680
 
diff --git a/drivers/sensor/ens210/Kconfig b/drivers/sensor/ens210/Kconfig
index 24a8967..3c8b66e 100644
--- a/drivers/sensor/ens210/Kconfig
+++ b/drivers/sensor/ens210/Kconfig
@@ -17,19 +17,19 @@
 	bool "Enable CRC Check"
 	default y
 	help
-	 Check the crc value after data reading.
+	  Check the crc value after data reading.
 
 config ENS210_MAX_STAT_RETRIES
 	int "Number of status read retries"
 	default 4
 	help
-	 Number of retries when status reading failed or device not ready.
+	  Number of retries when status reading failed or device not ready.
 
 config ENS210_MAX_READ_RETRIES
 	int "Number of value reading retries"
 	default 4
 	help
-	 Number of retries when value reading failed, value not valid
-	 or crc not ok.
+	  Number of retries when value reading failed, value not valid
+	  or crc not ok.
 
 endif # ENS210
diff --git a/drivers/sensor/lsm6dsl/Kconfig b/drivers/sensor/lsm6dsl/Kconfig
index 8473110..2a533cd 100644
--- a/drivers/sensor/lsm6dsl/Kconfig
+++ b/drivers/sensor/lsm6dsl/Kconfig
@@ -78,7 +78,7 @@
 
 endchoice
 
-endif #LSM6DSL_SENSORHUB
+endif # LSM6DSL_SENSORHUB
 
 menu "Attributes"
 
diff --git a/drivers/sensor/lsm6dso/Kconfig b/drivers/sensor/lsm6dso/Kconfig
index 405d09e..4a7fe55 100644
--- a/drivers/sensor/lsm6dso/Kconfig
+++ b/drivers/sensor/lsm6dso/Kconfig
@@ -98,7 +98,7 @@
 config LSM6DSO_EXT_LPS22HB
 	bool "Enable LPS22HB as external sensor"
 
-endif #LSM6DSO_SENSORHUB
+endif # LSM6DSO_SENSORHUB
 
 menu "Attributes"
 
diff --git a/drivers/sensor/mcp9808/Kconfig b/drivers/sensor/mcp9808/Kconfig
index 5a0491c..40935de 100644
--- a/drivers/sensor/mcp9808/Kconfig
+++ b/drivers/sensor/mcp9808/Kconfig
@@ -10,7 +10,7 @@
 	bool "MCP9808 temperature sensor"
 	depends on I2C
 	help
-	 Enable driver for MCP9808 temperature sensor.
+	  Enable driver for MCP9808 temperature sensor.
 
 if MCP9808
 
@@ -18,19 +18,18 @@
 	string "MCP9808 device name"
 	default "MCP9808"
 
-
 config MCP9808_I2C_ADDR
 	hex "MCP9808 I2C slave address"
 	default 0x18
 	help
-	 Specify the I2C slave address for the MCP9808.
+	  Specify the I2C slave address for the MCP9808.
 
 config MCP9808_I2C_DEV_NAME
 	string "I2C master where MCP9808 is connected"
 	default "I2C_0"
 	help
-	 Specify the device name of the I2C master device to which MCP9808 is
-	 connected.
+	  Specify the device name of the I2C master device to which MCP9808 is
+	  connected.
 
 choice
 	prompt "MCP9808 trigger mode"
diff --git a/drivers/sensor/ms5837/Kconfig b/drivers/sensor/ms5837/Kconfig
index b56aa07..117b3ca 100644
--- a/drivers/sensor/ms5837/Kconfig
+++ b/drivers/sensor/ms5837/Kconfig
@@ -10,4 +10,4 @@
 	bool "MS5837 pressure and temperature sensor"
 	depends on I2C && HAS_DTS_I2C
 	help
-	 Enable driver for MS5837 pressure and temperature sensor.
+	  Enable driver for MS5837 pressure and temperature sensor.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 8845ce5..e3cf8d6 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -39,7 +39,7 @@
 source "subsys/logging/Kconfig.template.log_config"
 
 
-config	SPI_0
+config SPI_0
 	bool "SPI port 0"
 	help
 	  Enable SPI controller port 0.
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index e5eab51..c716626 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -97,7 +97,7 @@
 	  value of CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC will be used instead;
 	  many MCUs these values are the same.
 
-endif #LOAPIC_TIMER
+endif # LOAPIC_TIMER
 
 menuconfig ARCV2_TIMER
 	bool "ARC Timer"
diff --git a/drivers/wifi/simplelink/Kconfig.simplelink b/drivers/wifi/simplelink/Kconfig.simplelink
index 2625d4f..b7f74e5 100644
--- a/drivers/wifi/simplelink/Kconfig.simplelink
+++ b/drivers/wifi/simplelink/Kconfig.simplelink
@@ -23,31 +23,31 @@
 	# MTU (ipv4) per: http://www.ti.com/lit/ug/swru455d/swru455d.pdf:
 	default 1472
 	help
-	 Set the maximum size of a network packet going through the chip.
-	 This sets the size of each buffer, in each buffer pool.
-	 Do not modify it unless you know what you are doing.
+	  Set the maximum size of a network packet going through the chip.
+	  This sets the size of each buffer, in each buffer pool.
+	  Do not modify it unless you know what you are doing.
 
 config WIFI_SIMPLELINK_SCAN_COUNT
 	int "Number of entries in network scan table: Max: 30"
 	default 20
 	help
-	 The number of results to request on a Wi-Fi scan operation.
-	 Actual number returned may be less.  Maximum is 30.
+	  The number of results to request on a Wi-Fi scan operation.
+	  Actual number returned may be less.  Maximum is 30.
 
 config WIFI_SIMPLELINK_MAX_SCAN_RETRIES
 	int "Number of retries to get network scan table"
 	default 10
 	help
-	 The number of times, separated by a one second interval, to retry
-	 a request for the network list.
+	  The number of times, separated by a one second interval, to retry
+	  a request for the network list.
 
 config WIFI_SIMPLELINK_FAST_CONNECT_TIMEOUT
 	int "Time (in seconds) to wait for fast connect on startup"
 	default 7
 	help
-	 SimpleLink uses the "FastConnect" feature to reconnect to the
-	 previously connected AP on startup. Should the Wi-Fi connection
-	 timeout, the SimpleLink driver will fail to initialize,
-	 and LOG an error.
+	  SimpleLink uses the "FastConnect" feature to reconnect to the
+	  previously connected AP on startup. Should the Wi-Fi connection
+	  timeout, the SimpleLink driver will fail to initialize,
+	  and LOG an error.
 
 endif # WIFI_SIMPLELINK
diff --git a/drivers/wifi/winc1500/Kconfig.winc1500 b/drivers/wifi/winc1500/Kconfig.winc1500
index d21ee91..d6921e9 100644
--- a/drivers/wifi/winc1500/Kconfig.winc1500
+++ b/drivers/wifi/winc1500/Kconfig.winc1500
@@ -43,23 +43,23 @@
 	int "Number of buffer per-buffer pool"
 	default 1
 	help
-	 Set the number of buffer the driver will have access to in each of
-	 its buffer pools.
+	  Set the number of buffer the driver will have access to in each of
+	  its buffer pools.
 
 config WIFI_WINC1500_MAX_PACKET_SIZE
 	int "Maximum size of a packet, in bytes"
 	default 1500
 	help
-	 Set the maximum size of a network packet going through the chip.
-	 This sets the size of each buffer, in each buffer pools.
-	 Do not modify it unless you know what you are doing.
+	  Set the maximum size of a network packet going through the chip.
+	  This sets the size of each buffer, in each buffer pools.
+	  Do not modify it unless you know what you are doing.
 
 config WIFI_WINC1500_OFFLOAD_MAX_SOCKETS
 	int "Maximum number of sockets that can be managed"
 	default 2
 	help
-	 Set the number of sockets that can be managed through the driver
-	 and the chip.
+	  Set the number of sockets that can be managed through the driver
+	  and the chip.
 
 choice
 	bool "In which region is the chip running?"
diff --git a/kernel/Kconfig b/kernel/Kconfig
index fac61b7..c84c634 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -100,22 +100,22 @@
 	int "Number of very-high priority 'preemptor' threads"
 	default 0
 	help
-	 This defines a set of priorities at the (numerically) lowest
-	 end of the range which have "meta-irq" behavior.  Runnable
-	 threads at these priorities will always be scheduled before
-	 threads at lower priorities, EVEN IF those threads are
-	 otherwise cooperative and/or have taken a scheduler lock.
-	 Making such a thread runnable in any way thus has the effect
-	 of "interrupting" the current task and running the meta-irq
-	 thread synchronously, like an exception or system call.  The
-	 intent is to use these priorities to implement "interrupt
-	 bottom half" or "tasklet" behavior, allowing driver
-	 subsystems to return from interrupt context but be guaranteed
-	 that user code will not be executed (on the current CPU)
-	 until the remaining work is finished.  As this breaks the
-	 "promise" of non-preemptibility granted by the current API
-	 for cooperative threads, this tool probably shouldn't be used
-	 from application code.
+	  This defines a set of priorities at the (numerically) lowest
+	  end of the range which have "meta-irq" behavior.  Runnable
+	  threads at these priorities will always be scheduled before
+	  threads at lower priorities, EVEN IF those threads are
+	  otherwise cooperative and/or have taken a scheduler lock.
+	  Making such a thread runnable in any way thus has the effect
+	  of "interrupting" the current task and running the meta-irq
+	  thread synchronously, like an exception or system call.  The
+	  intent is to use these priorities to implement "interrupt
+	  bottom half" or "tasklet" behavior, allowing driver
+	  subsystems to return from interrupt context but be guaranteed
+	  that user code will not be executed (on the current CPU)
+	  until the remaining work is finished.  As this breaks the
+	  "promise" of non-preemptibility granted by the current API
+	  for cooperative threads, this tool probably shouldn't be used
+	  from application code.
 
 config SCHED_DEADLINE
 	bool "Enable earliest-deadline-first scheduling"
diff --git a/lib/gui/lvgl/Kconfig.objects b/lib/gui/lvgl/Kconfig.objects
index 786576b..1686efc 100644
--- a/lib/gui/lvgl/Kconfig.objects
+++ b/lib/gui/lvgl/Kconfig.objects
@@ -314,7 +314,7 @@
 	int "List focus time"
 	default 100
 	help
-		List focus animation time in milliseconds
+	  List focus animation time in milliseconds
 
 endif
 
diff --git a/lib/posix/Kconfig b/lib/posix/Kconfig
index af91c54..f2610df 100644
--- a/lib/posix/Kconfig
+++ b/lib/posix/Kconfig
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-config	POSIX_MAX_FDS
+config POSIX_MAX_FDS
 	int "Maximum number of open file descriptors"
 	default 16 if POSIX_API
 	default 4
@@ -65,20 +65,20 @@
 	  This enabled POSIX message queue related APIs.
 
 if POSIX_MQUEUE
-config	MSG_COUNT_MAX
+config MSG_COUNT_MAX
 	int "Maximum number of messages in message queue"
 	default 16
 	help
 	  Mention maximum number of messages in message queue in POSIX compliant
 	  application.
 
-config	MSG_SIZE_MAX
+config MSG_SIZE_MAX
 	int "Maximum size of a message"
 	default 16
 	help
 	  Mention maximum size of message in bytes.
 
-config	MQUEUE_NAMELEN_MAX
+config MQUEUE_NAMELEN_MAX
 	int "Maximum size of a name length"
 	default 16
 	range 2 255
@@ -95,7 +95,7 @@
 	  This enables POSIX style file system related APIs.
 
 if POSIX_FS
-config	POSIX_MAX_OPEN_FILES
+config POSIX_MAX_OPEN_FILES
 	int "Maximum number of open file descriptors"
 	default 16
 	help
@@ -109,9 +109,9 @@
 # The name of this option is mandated by zephyr_interface_library_named
 # cmake directive.
 config APP_LINK_WITH_POSIX_SUBSYS
-        bool "Make POSIX headers available to application"
-        default y
-        help
-          Add POSIX subsystem header files to the 'app' include path.
+	bool "Make POSIX headers available to application"
+	default y
+	help
+	  Add POSIX subsystem header files to the 'app' include path.
 
 endif # POSIX_API
diff --git a/modules/Kconfig.st b/modules/Kconfig.st
index 47ffdba..a84dfeb 100644
--- a/modules/Kconfig.st
+++ b/modules/Kconfig.st
@@ -3,7 +3,7 @@
 # Copyright (c) 2017 STMicroelectronics
 
 config HAS_STLIB
-    bool
+	bool
 
 config HAS_STMEMSC
 	bool
diff --git a/modules/Kconfig.stm32 b/modules/Kconfig.stm32
index ad53ec1..4d22c29 100644
--- a/modules/Kconfig.stm32
+++ b/modules/Kconfig.stm32
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config HAS_STM32CUBE
-    bool
-    select HAS_CMSIS_CORE
-    depends on SOC_FAMILY_STM32
+	bool
+	select HAS_CMSIS_CORE
+	depends on SOC_FAMILY_STM32
 
 if HAS_STM32CUBE
 
diff --git a/soc/arc/snps_emsdp/Kconfig b/soc/arc/snps_emsdp/Kconfig
index de7c38d..8954680 100644
--- a/soc/arc/snps_emsdp/Kconfig
+++ b/soc/arc/snps_emsdp/Kconfig
@@ -7,8 +7,8 @@
 if SOC_ARC_EMSDP
 
 choice
-prompt "ARC EM Software Development Platform Core Selection"
-default SOC_EMSDP_EM11D
+	prompt "ARC EM Software Development Platform Core Selection"
+	default SOC_EMSDP_EM11D
 
 config SOC_EMSDP_EM4
 	bool "Synopsys ARC EM4 of EMSDP"
@@ -46,4 +46,4 @@
 
 endchoice
 
-endif #SOC_ARC_EMSDP
+endif # SOC_ARC_EMSDP
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
index f8b5b6a..f2e284f 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM11D
+endif # SOC_EMSDP_EM11D
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em4 b/soc/arc/snps_emsdp/Kconfig.defconfig.em4
index 8bc2492..6ad1711 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em4
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em4
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM4
+endif # SOC_EMSDP_EM4
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
index 4e77ad2..9e11b2a 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM5D
+endif # SOC_EMSDP_EM5D
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em6 b/soc/arc/snps_emsdp/Kconfig.defconfig.em6
index ad528e8..64baab4 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em6
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em6
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM6
+endif # SOC_EMSDP_EM6
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
index 9631be8..174a224 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM7D
+endif # SOC_EMSDP_EM7D
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
index da29990..40106ab 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
@@ -30,4 +30,4 @@
 config FP_FPU_DA
 	default y
 
-endif #SOC_EMSDP_EM7D_ESP
+endif # SOC_EMSDP_EM7D_ESP
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
index fcf8022..314f72f 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
@@ -43,4 +43,4 @@
 
 endif # ZTEST
 
-endif #SOC_EMSDP_EM9D
+endif # SOC_EMSDP_EM9D
diff --git a/soc/arc/snps_emsk/Kconfig b/soc/arc/snps_emsk/Kconfig
index 8de3836..0d45678 100644
--- a/soc/arc/snps_emsk/Kconfig
+++ b/soc/arc/snps_emsk/Kconfig
@@ -8,8 +8,8 @@
 if SOC_EMSK
 
 choice
-prompt "ARC EM Starter Kit Core Selection"
-default SOC_EMSK_EM7D
+	prompt "ARC EM Starter Kit Core Selection"
+	default SOC_EMSK_EM7D
 
 config SOC_EMSK_EM7D
 	bool "Synopsys ARC EM7D of EMSK"
@@ -25,4 +25,4 @@
 
 endchoice
 
-endif #SOC_EMSK
+endif # SOC_EMSK
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig b/soc/arc/snps_emsk/Kconfig.defconfig
index 99738d1..75b4b06 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig
+++ b/soc/arc/snps_emsk/Kconfig.defconfig
@@ -14,4 +14,4 @@
 source "soc/arc/snps_emsk/Kconfig.defconfig.em11d"
 source "soc/arc/snps_emsk/Kconfig.defconfig.em9d"
 
-endif #SOC_EMSK
+endif # SOC_EMSK
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em11d b/soc/arc/snps_emsk/Kconfig.defconfig.em11d
index 4be3cbb..f3bc52d 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em11d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em11d
@@ -35,4 +35,4 @@
 config FP_FPU_DA
 	default y
 
-endif #SOC_EMSK_EM11D
+endif # SOC_EMSK_EM11D
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em7d b/soc/arc/snps_emsk/Kconfig.defconfig.em7d
index a0a3b16..5701563 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em7d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em7d
@@ -58,4 +58,4 @@
 
 endif # ARC_MPU_VER
 
-endif #SOC_EMSK_EM7D
+endif # SOC_EMSK_EM7D
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em9d b/soc/arc/snps_emsk/Kconfig.defconfig.em9d
index a848c94..eff786a 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em9d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em9d
@@ -29,4 +29,4 @@
 config HARVARD
 	default y
 
-endif #SOC_EMSK_EM9D
+endif # SOC_EMSK_EM9D
diff --git a/soc/arc/snps_nsim/Kconfig b/soc/arc/snps_nsim/Kconfig
index 44a891e..3c2e0b9 100644
--- a/soc/arc/snps_nsim/Kconfig
+++ b/soc/arc/snps_nsim/Kconfig
@@ -7,8 +7,8 @@
 if SOC_NSIM
 
 choice
-prompt "ARC nSIM SoC Selection"
-default SOC_NSIM_EM
+	prompt "ARC nSIM SoC Selection"
+	default SOC_NSIM_EM
 
 config SOC_NSIM_EM
 	bool "Synopsys ARC EM in nSIM"
@@ -31,4 +31,4 @@
 
 endchoice
 
-endif #SOC_NSIM
+endif # SOC_NSIM
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig b/soc/arc/snps_nsim/Kconfig.defconfig
index 9e79641..a2eb40f 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig
+++ b/soc/arc/snps_nsim/Kconfig.defconfig
@@ -17,4 +17,4 @@
 source "soc/arc/snps_nsim/Kconfig.defconfig.hs"
 source "soc/arc/snps_nsim/Kconfig.defconfig.hs_smp"
 
-endif #SOC_NSIM
+endif # SOC_NSIM
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.em b/soc/arc/snps_nsim/Kconfig.defconfig.em
index 6e1f915..39b84fd 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.em
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.em
@@ -56,4 +56,4 @@
 
 endif # ARC_MPU_VER
 
-endif #SOC_NSIM_EM
+endif # SOC_NSIM_EM
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs b/soc/arc/snps_nsim/Kconfig.defconfig.hs
index 95994bb..91da724 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.hs
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs
@@ -30,4 +30,4 @@
 config CACHE_FLUSHING
 	default y
 
-endif #SOC_NSIM_HS
+endif # SOC_NSIM_HS
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
index b7a5cac..18d1a6c 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
@@ -36,4 +36,4 @@
 config MP_NUM_CPUS
 	default 2
 
-endif #SOC_NSIM_HS_SMP
+endif # SOC_NSIM_HS_SMP
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.sem b/soc/arc/snps_nsim/Kconfig.defconfig.sem
index ad2c392..a64e699 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.sem
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.sem
@@ -36,4 +36,4 @@
 config CACHE_FLUSHING
 	default y
 
-endif #SOC_NSIM_SEM
+endif # SOC_NSIM_SEM
diff --git a/soc/arm/arm/beetle/Kconfig.series b/soc/arm/arm/beetle/Kconfig.series
index 8ded8a3..621e251 100644
--- a/soc/arm/arm/beetle/Kconfig.series
+++ b/soc/arm/arm/beetle/Kconfig.series
@@ -13,4 +13,4 @@
 	select SOC_FAMILY_ARM
 	select CPU_HAS_ARM_MPU
 	help
-	 Enable support for Beetle MCU Series
+	  Enable support for Beetle MCU Series
diff --git a/soc/arm/arm/beetle/Kconfig.soc b/soc/arm/arm/beetle/Kconfig.soc
index 7972d32..70438fc 100644
--- a/soc/arm/arm/beetle/Kconfig.soc
+++ b/soc/arm/arm/beetle/Kconfig.soc
@@ -7,8 +7,8 @@
 #
 
 choice
-prompt "ARM Beetle SoC"
-depends on SOC_SERIES_BEETLE
+	prompt "ARM Beetle SoC"
+	depends on SOC_SERIES_BEETLE
 
 config SOC_BEETLE_R0
 	bool "ARM BEETLE R0"
diff --git a/soc/arm/arm/mps2/Kconfig.soc b/soc/arm/arm/mps2/Kconfig.soc
index b1c4079..7771694 100644
--- a/soc/arm/arm/mps2/Kconfig.soc
+++ b/soc/arm/arm/mps2/Kconfig.soc
@@ -5,8 +5,8 @@
 #
 
 choice
-prompt "ARM MPS2 SoCs"
-depends on SOC_SERIES_MPS2
+	prompt "ARM MPS2 SoCs"
+	depends on SOC_SERIES_MPS2
 
 config SOC_MPS2_AN385
 	bool "ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385)"
diff --git a/soc/arm/arm/musca_a/Kconfig.soc b/soc/arm/arm/musca_a/Kconfig.soc
index 896fe10..e65685d 100644
--- a/soc/arm/arm/musca_a/Kconfig.soc
+++ b/soc/arm/arm/musca_a/Kconfig.soc
@@ -5,8 +5,8 @@
 #
 
 choice
-prompt "ARM Musca SoCs"
-depends on SOC_SERIES_MUSCA
+	prompt "ARM Musca SoCs"
+	depends on SOC_SERIES_MUSCA
 
 config SOC_V2M_MUSCA_A
 	bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA"
diff --git a/soc/arm/arm/musca_b1/Kconfig.soc b/soc/arm/arm/musca_b1/Kconfig.soc
index 2b9a7c0..5a6b00c 100644
--- a/soc/arm/arm/musca_b1/Kconfig.soc
+++ b/soc/arm/arm/musca_b1/Kconfig.soc
@@ -5,8 +5,8 @@
 #
 
 choice
-prompt "ARM Musca B1 SoCs"
-depends on SOC_SERIES_MUSCA_B1
+	prompt "ARM Musca B1 SoCs"
+	depends on SOC_SERIES_MUSCA_B1
 
 config SOC_V2M_MUSCA_B1
 	bool "ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1"
diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.soc b/soc/arm/atmel_sam0/samd20/Kconfig.soc
index 1e1068f..96dcc63 100644
--- a/soc/arm/atmel_sam0/samd20/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samd20/Kconfig.soc
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 choice
-prompt "Atmel SAMD20 MCU Selection"
-depends on SOC_SERIES_SAMD20
+	prompt "Atmel SAMD20 MCU Selection"
+	depends on SOC_SERIES_SAMD20
 
 config SOC_PART_NUMBER_SAMD20E14
 	bool "SAMD20E14"
diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.soc b/soc/arm/atmel_sam0/samd21/Kconfig.soc
index 0eac6b7..2ae909a 100644
--- a/soc/arm/atmel_sam0/samd21/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samd21/Kconfig.soc
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 choice
-prompt "Atmel SAMD21 MCU Selection"
-depends on SOC_SERIES_SAMD21
+	prompt "Atmel SAMD21 MCU Selection"
+	depends on SOC_SERIES_SAMD21
 
 config SOC_PART_NUMBER_SAMD21E15A
 	bool "SAMD21E15A"
diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.soc b/soc/arm/atmel_sam0/samr21/Kconfig.soc
index 77c6a73..d4e7dc6 100644
--- a/soc/arm/atmel_sam0/samr21/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samr21/Kconfig.soc
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 choice
-prompt "Atmel SAMR21 MCU Selection"
-depends on SOC_SERIES_SAMR21
+	prompt "Atmel SAMR21 MCU Selection"
+	depends on SOC_SERIES_SAMR21
 
 config SOC_PART_NUMBER_SAMR21E16A
 	bool "SAMR21E16A"
diff --git a/soc/arm/cypress/Kconfig b/soc/arm/cypress/Kconfig
index 17f7a29..f02e6d4 100644
--- a/soc/arm/cypress/Kconfig
+++ b/soc/arm/cypress/Kconfig
@@ -5,8 +5,8 @@
 #
 
 choice
-prompt "Cypress PSoC6 MCU Selection"
-depends on SOC_SERIES_PSOC62
+	prompt "Cypress PSoC6 MCU Selection"
+	depends on SOC_SERIES_PSOC62
 
 config SOC_PSOC6_M0
 	bool "SOC_PSOC6_M0"
diff --git a/soc/arm/cypress/psoc6/Kconfig.soc b/soc/arm/cypress/psoc6/Kconfig.soc
index 81425ce..06a27b2 100644
--- a/soc/arm/cypress/psoc6/Kconfig.soc
+++ b/soc/arm/cypress/psoc6/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "Cypress PSoC6 MCU Selection"
-depends on SOC_SERIES_PSOC62
+	prompt "Cypress PSoC6 MCU Selection"
+	depends on SOC_SERIES_PSOC62
 
 config SOC_PART_NUMBER_CY8C6247BZI_D54
 	bool "CY8C6247BZI_D54"
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.soc b/soc/arm/microchip_mec/mec1501/Kconfig.soc
index 55d0259..77c5d3c 100644
--- a/soc/arm/microchip_mec/mec1501/Kconfig.soc
+++ b/soc/arm/microchip_mec/mec1501/Kconfig.soc
@@ -7,8 +7,8 @@
 #
 
 choice
-prompt "MEC1501 Selection"
-depends on SOC_SERIES_MEC1501X
+	prompt "MEC1501 Selection"
+	depends on SOC_SERIES_MEC1501X
 
 config SOC_MEC1501_HSZ
 	bool "MEC1501_HSZ"
diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.soc b/soc/arm/microchip_mec/mec1701/Kconfig.soc
index d56b614..92afb13 100644
--- a/soc/arm/microchip_mec/mec1701/Kconfig.soc
+++ b/soc/arm/microchip_mec/mec1701/Kconfig.soc
@@ -7,8 +7,8 @@
 #
 
 choice
-prompt "MEC1701 Selection"
-depends on SOC_SERIES_MEC1701X
+	prompt "MEC1701 Selection"
+	depends on SOC_SERIES_MEC1701X
 
 config SOC_MEC1701_QSZ
 	bool "MEC1701_QSZ"
diff --git a/soc/arm/nordic_nrf/Kconfig.defconfig b/soc/arm/nordic_nrf/Kconfig.defconfig
index e5197a1..0657f80 100644
--- a/soc/arm/nordic_nrf/Kconfig.defconfig
+++ b/soc/arm/nordic_nrf/Kconfig.defconfig
@@ -9,13 +9,15 @@
 
 source "soc/arm/nordic_nrf/*/Kconfig.defconfig.series"
 
-if SYS_CLOCK_EXISTS
 # If the kernel has timer support, enable both clock control and timer
+if SYS_CLOCK_EXISTS
+
 config CLOCK_CONTROL
-       default y
+	default y
 
 config NRF_RTC_TIMER
-       default y
+	default y
+
 endif # SYS_CLOCK_EXISTS
 
 config SYS_CLOCK_HW_CYCLES_PER_SEC
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.soc b/soc/arm/nordic_nrf/nrf51/Kconfig.soc
index aaec141..c14bc12 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "nRF51x MCU Selection"
-depends on SOC_SERIES_NRF51X
+	prompt "nRF51x MCU Selection"
+	depends on SOC_SERIES_NRF51X
 
 config SOC_NRF51822_QFAA
 	bool "NRF51822_QFAA"
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series
index 23923c2..56d2357 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series
@@ -16,4 +16,4 @@
 	select HAS_NRFX
 	select HAS_SEGGER_RTT
 	help
-	 Enable support for NRF52 MCU series
+	  Enable support for NRF52 MCU series
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.soc b/soc/arm/nordic_nrf/nrf52/Kconfig.soc
index b2cc4ac..ff0e664 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.soc
@@ -231,8 +231,8 @@
 	select HAS_HW_NRF_WDT
 
 choice
-prompt "nRF52x MCU Selection"
-depends on SOC_SERIES_NRF52X
+	prompt "nRF52x MCU Selection"
+	depends on SOC_SERIES_NRF52X
 
 config SOC_NRF52810_QFAA
 	bool "NRF52810_QFAA"
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series
index 8e7b382..f8500d2 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series
@@ -18,4 +18,4 @@
 	select HAS_NRFX
 	select HAS_SEGGER_RTT
 	help
-	 Enable support for NRF91 MCU series
+	  Enable support for NRF91 MCU series
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.soc b/soc/arm/nordic_nrf/nrf91/Kconfig.soc
index f1c3887..11b5258 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.soc
@@ -57,7 +57,7 @@
 	select HAS_HW_NRF_WDT
 
 choice
-prompt "nRF91x MCU Selection"
+	prompt "nRF91x MCU Selection"
 	depends on SOC_SERIES_NRF91X
 
 config SOC_NRF9160_SICA
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
index 411b4e4..fa36d4c 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
+++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "i.MX 6SoloX Selection"
-depends on SOC_SERIES_IMX_6X_M4
+	prompt "i.MX 6SoloX Selection"
+	depends on SOC_SERIES_IMX_6X_M4
 
 config SOC_MCIMX6X_M4
 	bool "SOC_MCIMX6X_M4"
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
index ec6b073..35184e1 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
+++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "i.MX7 M4 Selection"
-depends on SOC_SERIES_IMX7_M4
+	prompt "i.MX7 M4 Selection"
+	depends on SOC_SERIES_IMX7_M4
 
 config SOC_MCIMX7_M4
 	bool "SOC_MCIMX7_M4"
diff --git a/soc/arm/nxp_imx/rt/Kconfig.soc b/soc/arm/nxp_imx/rt/Kconfig.soc
index 8d9c661..ac56f12 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.soc
+++ b/soc/arm/nxp_imx/rt/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "i.MX RT Selection"
-depends on SOC_SERIES_IMX_RT
+	prompt "i.MX RT Selection"
+	depends on SOC_SERIES_IMX_RT
 
 config SOC_MIMXRT1015
 	bool "SOC_MIMXRT1015"
@@ -346,7 +346,7 @@
 
 config CODE_FLEXSPI2
 	bool "Link code into internal FlexSPI-controlled memory"
-        select NXP_IMX_RT_BOOT_HEADER
+	select NXP_IMX_RT_BOOT_HEADER
 
 endchoice
 
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.soc b/soc/arm/nxp_kinetis/k2x/Kconfig.soc
index 3fb831d..64dc135 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc
@@ -8,8 +8,8 @@
 #
 
 choice
-prompt "Kinetis K2x MCU Selection"
-depends on SOC_SERIES_KINETIS_K2X
+	prompt "Kinetis K2x MCU Selection"
+	depends on SOC_SERIES_KINETIS_K2X
 
 config SOC_MK22F51212
 	bool "SOC_MK22F51212"
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.soc b/soc/arm/nxp_kinetis/k6x/Kconfig.soc
index 4860b05..36a383d 100644
--- a/soc/arm/nxp_kinetis/k6x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k6x/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "Kinetis K6x MCU Selection"
-depends on SOC_SERIES_KINETIS_K6X
+	prompt "Kinetis K6x MCU Selection"
+	depends on SOC_SERIES_KINETIS_K6X
 
 config SOC_MK64F12
 	bool "SOC_MK64F12"
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
index 9272d3d..ba34dac 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
@@ -89,7 +89,7 @@
 	  handling.
 
 config KINETIS_KE1XF_ENABLE_CODE_CACHE
-        bool "Enable the code cache"
-        default y
+	bool "Enable the code cache"
+	default y
 
 endif # SOC_SERIES_KINETIS_KE1XF
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.series b/soc/arm/nxp_kinetis/kl2x/Kconfig.series
index 6ba778f..4c63d7f 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.series
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.series
@@ -12,4 +12,4 @@
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select CLOCK_CONTROL
 	help
-	 Enable support for Kinetis KL2x MCU series
+	  Enable support for Kinetis KL2x MCU series
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
index 6974aab..3460808 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "Kinetis KL2x MCU Selection"
-depends on SOC_SERIES_KINETIS_KL2X
+	prompt "Kinetis KL2x MCU Selection"
+	depends on SOC_SERIES_KINETIS_KL2X
 
 config SOC_MKL25Z4
 	bool "SOC_MKL25Z4"
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.soc b/soc/arm/nxp_kinetis/kwx/Kconfig.soc
index ae8bd17..4059f97 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "Kinetis KWx MCU Selection"
-depends on SOC_SERIES_KINETIS_KWX
+	prompt "Kinetis KWx MCU Selection"
+	depends on SOC_SERIES_KINETIS_KWX
 
 config SOC_MKW22D5
 	bool "SOC_MKW22D5"
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
index 4477aa5..cff645c 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "LPC LPC54XXX MCU Selection"
-depends on SOC_SERIES_LPC54XXX
+	prompt "LPC LPC54XXX MCU Selection"
+	depends on SOC_SERIES_LPC54XXX
 
 config SOC_LPC54114_M4
 	bool "SOC_LPC54114_M4"
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
index 6b8cedd..2e99900 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "LPC5500 Series MCU Selection"
-depends on SOC_SERIES_LPC55XXX
+	prompt "LPC5500 Series MCU Selection"
+	depends on SOC_SERIES_LPC55XXX
 
 config SOC_LPC55S69_CPU0
 	bool "SOC_LPC55S69 M33 [CPU 0]"
diff --git a/soc/arm/st_stm32/common/Kconfig.defconfig.series b/soc/arm/st_stm32/common/Kconfig.defconfig.series
index 13628b6..0cc0866 100644
--- a/soc/arm/st_stm32/common/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/common/Kconfig.defconfig.series
@@ -18,14 +18,14 @@
 config CLOCK_CONTROL_STM32_CUBE
 	default y
 
-endif #CLOCK_CONTROL
+endif # CLOCK_CONTROL
 
 if SERIAL
 
 config UART_STM32
 	default y
 
-endif #SERIAL
+endif # SERIAL
 
 if GPIO
 
@@ -41,14 +41,14 @@
 config GPIO_STM32_PORTC
 	default y
 
-endif #GPIO
+endif # GPIO
 
 if PINMUX
 
 config PINMUX_STM32
 	default y
 
-endif #PINMUX
+endif # PINMUX
 
 if WATCHDOG
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.series b/soc/arm/st_stm32/stm32f0/Kconfig.series
index bc9dcdc..6054319 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.series
@@ -13,4 +13,4 @@
 	select CPU_CORTEX_M_HAS_SYSTICK
 	select HAS_STM32CUBE
 	help
-	 Enable support for STM32F0 MCU series
+	  Enable support for STM32F0 MCU series
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.soc b/soc/arm/st_stm32/stm32f0/Kconfig.soc
index 1d6fc60..4270cb2 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32F0x MCU Selection"
-depends on SOC_SERIES_STM32F0X
+	prompt "STM32F0x MCU Selection"
+	depends on SOC_SERIES_STM32F0X
 
 config SOC_STM32F030X4
 	bool "STM32F030X4"
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.series b/soc/arm/st_stm32/stm32f1/Kconfig.series
index eb149d2..07600d3 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.series
@@ -12,4 +12,4 @@
 	select HAS_STM32CUBE
 	select HAS_SWO
 	help
-	 Enable support for STM32F1 MCU series
+	  Enable support for STM32F1 MCU series
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.soc b/soc/arm/st_stm32/stm32f1/Kconfig.soc
index 72b6b13..40b1ddb 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.soc
@@ -7,8 +7,8 @@
 #
 
 choice
-prompt "STM32F1x MCU Selection"
-depends on SOC_SERIES_STM32F1X
+	prompt "STM32F1x MCU Selection"
+	depends on SOC_SERIES_STM32F1X
 
 config SOC_STM32F103XE
 	bool "STM32F103XE"
@@ -31,16 +31,16 @@
 config SOC_STM32F10X_DENSITY_DEVICE
 	bool
 	help
-	 * Low density Value line devices
-	 * Medium density Value line devices
-	 * High density Value line devices
-	 * XL-density devices Value line devices
+	  * Low density Value line devices
+	  * Medium density Value line devices
+	  * High density Value line devices
+	  * XL-density devices Value line devices
 
 config SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE
 	bool
 	help
-	 Connectivity line devices are STM32F105xx and STM32F107xx
-	 microcontrollers.  They are intended for applications where
-	 connectivity and real-time performances are required such as
-	 industrial control, control panels for security applications, UPS or
-	 home audio.  For STM32F107xx also the Ethernet MAC is available.
+	  Connectivity line devices are STM32F105xx and STM32F107xx
+	  microcontrollers.  They are intended for applications where
+	  connectivity and real-time performances are required such as
+	  industrial control, control panels for security applications, UPS or
+	  home audio.  For STM32F107xx also the Ethernet MAC is available.
diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.soc b/soc/arm/st_stm32/stm32f2/Kconfig.soc
index e89292d..2e7e7e7 100644
--- a/soc/arm/st_stm32/stm32f2/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f2/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32F2X MCU Selection"
-depends on SOC_SERIES_STM32F2X
+	prompt "STM32F2X MCU Selection"
+	depends on SOC_SERIES_STM32F2X
 
 config SOC_STM32F207XX
 	bool "STM32F207XX"
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.series b/soc/arm/st_stm32/stm32f3/Kconfig.series
index 6bf4fbb..4008805 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.series
@@ -13,4 +13,4 @@
 	select HAS_STM32CUBE
 	select HAS_SWO
 	help
-	 Enable support for STM32F3 MCU series
+	  Enable support for STM32F3 MCU series
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.soc b/soc/arm/st_stm32/stm32f3/Kconfig.soc
index de45455..53aa7ad 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32F3x MCU Selection"
-depends on SOC_SERIES_STM32F3X
+	prompt "STM32F3x MCU Selection"
+	depends on SOC_SERIES_STM32F3X
 
 config SOC_STM32F302X8
 	bool "STM32F302X8"
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.series b/soc/arm/st_stm32/stm32f4/Kconfig.series
index 95f4935..b88e12b 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.series
@@ -14,4 +14,4 @@
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	help
-	 Enable support for STM32F4 MCU series
+	  Enable support for STM32F4 MCU series
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.soc b/soc/arm/st_stm32/stm32f4/Kconfig.soc
index 71531ee..fc8aac3 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32F4x MCU Selection"
-depends on SOC_SERIES_STM32F4X
+	prompt "STM32F4x MCU Selection"
+	depends on SOC_SERIES_STM32F4X
 
 config SOC_STM32F401XC
 	bool "STM32F401XC"
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.series b/soc/arm/st_stm32/stm32f7/Kconfig.series
index 9d401c4..a557dc9 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.series
@@ -14,4 +14,4 @@
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	help
-	 Enable support for STM32F7 MCU series
+	  Enable support for STM32F7 MCU series
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.soc b/soc/arm/st_stm32/stm32f7/Kconfig.soc
index a4f73a1..fededec 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32F7x MCU Selection"
-depends on SOC_SERIES_STM32F7X
+	prompt "STM32F7x MCU Selection"
+	depends on SOC_SERIES_STM32F7X
 
 config SOC_STM32F723XX
 	bool "STM32F723XX"
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.soc b/soc/arm/st_stm32/stm32g0/Kconfig.soc
index 2f1c8a0..ea14cc0 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.soc
@@ -7,11 +7,10 @@
 #
 
 choice
-prompt "STM32G0x MCU Selection"
-depends on SOC_SERIES_STM32G0X
+	prompt "STM32G0x MCU Selection"
+	depends on SOC_SERIES_STM32G0X
 
 config SOC_STM32G071XX
 	bool "STM32G071XX"
 
-
 endchoice
diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.soc b/soc/arm/st_stm32/stm32g4/Kconfig.soc
index 4da74f0..897e1a7 100644
--- a/soc/arm/st_stm32/stm32g4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32g4/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32G4x MCU Selection"
-depends on SOC_SERIES_STM32G4X
+	prompt "STM32G4x MCU Selection"
+	depends on SOC_SERIES_STM32G4X
 
 config SOC_STM32G431XX
 	bool "STM32G431XX"
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.series b/soc/arm/st_stm32/stm32h7/Kconfig.series
index 4a5790a..c1cbba2 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.series
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.series
@@ -14,15 +14,15 @@
 	select REQUIRES_FULL_LIBC
 	select USE_STM32_HAL_RCC_EX if CPU_CORTEX_M4
 	help
-	 Enable support for STM32H7 MCU series
+	  Enable support for STM32H7 MCU series
 
 config STM32H7_DUAL_CORE
 	bool "Enable Dual Core"
 	depends on SOC_SERIES_STM32H7X
 
 choice STM32H7_DUAL_CORE_BOOT
-prompt "STM32H7x Boot type selection"
-depends on STM32H7_DUAL_CORE
+	prompt "STM32H7x Boot type selection"
+	depends on STM32H7_DUAL_CORE
 
 config STM32H7_BOOT_CM4_CM7
 	bool "Boot both CM4 and CM7"
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.soc b/soc/arm/st_stm32/stm32h7/Kconfig.soc
index fbf95dc..ee39af3 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32H7x MCU Selection"
-depends on SOC_SERIES_STM32H7X
+	prompt "STM32H7x MCU Selection"
+	depends on SOC_SERIES_STM32H7X
 
 config SOC_STM32H747XX
 	bool "STM32H747XX"
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.soc b/soc/arm/st_stm32/stm32l0/Kconfig.soc
index bfe247c..c6a57a3 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32L0x MCU Selection"
-depends on SOC_SERIES_STM32L0X
+	prompt "STM32L0x MCU Selection"
+	depends on SOC_SERIES_STM32L0X
 
 config SOC_STM32L053XX
 	bool "STM32L053XX"
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.soc b/soc/arm/st_stm32/stm32l1/Kconfig.soc
index 4621d85..d238266 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32L1x MCU Selection"
-depends on SOC_SERIES_STM32L1X
+	prompt "STM32L1x MCU Selection"
+	depends on SOC_SERIES_STM32L1X
 
 config SOC_STM32L151X8A
 	bool "STM32L151X8A"
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.series b/soc/arm/st_stm32/stm32l4/Kconfig.series
index 2d1e18e..723cd01 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.series
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.series
@@ -15,4 +15,4 @@
 	select CPU_HAS_ARM_MPU
 	select HAS_SWO
 	help
-		Enable support for STM32L4 MCU series
+	  Enable support for STM32L4 MCU series
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.soc b/soc/arm/st_stm32/stm32l4/Kconfig.soc
index f22ad86..032ea31 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.soc
@@ -9,8 +9,8 @@
 #
 
 choice
-prompt "STM32L4x MCU Selection"
-depends on SOC_SERIES_STM32L4X
+	prompt "STM32L4x MCU Selection"
+	depends on SOC_SERIES_STM32L4X
 
 config SOC_STM32L476XX
 	bool "STM32L476X"
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.series
index 53f252c..59f4e9b 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.series
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.series
@@ -12,4 +12,4 @@
 	select HAS_STM32CUBE
 	select CPU_HAS_ARM_MPU
 	help
-		Enable support for STM32MP1 MPU series
+	  Enable support for STM32MP1 MPU series
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.soc b/soc/arm/st_stm32/stm32mp1/Kconfig.soc
index 54da848..d51284f 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "STM32MP1 MPU Selection"
-depends on SOC_SERIES_STM32MP1X
+	prompt "STM32MP1 MPU Selection"
+	depends on SOC_SERIES_STM32MP1X
 
 config SOC_STM32MP15_M4
 	bool "STM32MP15_M4"
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
index d1bea8b..fd3f3ca 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "TI SimpleLink MCU Selection"
-depends on SOC_SERIES_CC13X2_CC26X2
+	prompt "TI SimpleLink MCU Selection"
+	depends on SOC_SERIES_CC13X2_CC26X2
 
 config SOC_CC2652R
 	bool "CC2652R"
diff --git a/soc/arm/ti_simplelink/cc2650/Kconfig.soc b/soc/arm/ti_simplelink/cc2650/Kconfig.soc
index 39ca0a8..9a2502c 100644
--- a/soc/arm/ti_simplelink/cc2650/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc2650/Kconfig.soc
@@ -4,8 +4,8 @@
 #
 
 choice
-prompt "TI SimpleLink MCU Selection"
-depends on SOC_SERIES_CC2650
+	prompt "TI SimpleLink MCU Selection"
+	depends on SOC_SERIES_CC2650
 
 config SOC_CC2650
 	bool "CC2650"
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
index 31e342d..8187328 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
@@ -4,8 +4,8 @@
 #
 
 choice
-prompt "TI SimpleLink MCU Selection"
-depends on SOC_SERIES_CC32XX
+	prompt "TI SimpleLink MCU Selection"
+	depends on SOC_SERIES_CC32XX
 
 config SOC_CC3220SF
 	bool "CC3220SF"
diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
index 7bcd038..fb47024 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
+++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "TI SimpleLink MCU Selection"
-depends on SOC_SERIES_MSP432P4XX
+	prompt "TI SimpleLink MCU Selection"
+	depends on SOC_SERIES_MSP432P4XX
 
 config SOC_MSP432P401R
 	bool "MSP432P401R"
diff --git a/soc/nios2/nios2f-zephyr/Kconfig.defconfig b/soc/nios2/nios2f-zephyr/Kconfig.defconfig
index 75eeaf3..8d418f2 100644
--- a/soc/nios2/nios2f-zephyr/Kconfig.defconfig
+++ b/soc/nios2/nios2f-zephyr/Kconfig.defconfig
@@ -23,7 +23,7 @@
 config ALTERA_AVALON_QSPI
 	def_bool y
 
-endif #SOC_FLASH_NIOS2_QSPI
+endif # SOC_FLASH_NIOS2_QSPI
 
 if I2C_NIOS2
 
diff --git a/soc/riscv/openisa_rv32m1/Kconfig b/soc/riscv/openisa_rv32m1/Kconfig
index 0508766..6f5a2e5 100644
--- a/soc/riscv/openisa_rv32m1/Kconfig
+++ b/soc/riscv/openisa_rv32m1/Kconfig
@@ -16,7 +16,7 @@
 if SOC_OPENISA_RV32M1_RISCV32
 
 choice
-prompt "OpenISA RV32M1 RISC-V Core Selection"
+	prompt "OpenISA RV32M1 RISC-V Core Selection"
 
 config SOC_OPENISA_RV32M1_RI5CY
 	bool "OpenISA RV32M1 RI5CY core"
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.series b/soc/riscv/riscv-privilege/miv/Kconfig.series
index e6704df..eae3938 100644
--- a/soc/riscv/riscv-privilege/miv/Kconfig.series
+++ b/soc/riscv/riscv-privilege/miv/Kconfig.series
@@ -10,4 +10,4 @@
 	depends on RISCV
 	select SOC_FAMILY_RISCV_PRIVILEGE
 	help
-	Enable support for Microsemi Mi-V
+	  Enable support for Microsemi Mi-V
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.soc b/soc/riscv/riscv-privilege/miv/Kconfig.soc
index 781adbc..b10990c 100644
--- a/soc/riscv/riscv-privilege/miv/Kconfig.soc
+++ b/soc/riscv/riscv-privilege/miv/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "Microsemi Mi-V system implementation"
-depends on SOC_SERIES_RISCV32_MIV
+	prompt "Microsemi Mi-V system implementation"
+	depends on SOC_SERIES_RISCV32_MIV
 
 config SOC_RISCV32_MIV
 	bool "Microsemi Mi-V system implementation"
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
index 5e1ebb0..df48252 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
+++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
@@ -6,8 +6,8 @@
 #
 
 choice
-prompt "SiFive Freedom SOC implementation"
-depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM
+	prompt "SiFive Freedom SOC implementation"
+	depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM
 
 config SOC_RISCV_SIFIVE_FREEDOM
 	bool "SiFive Freedom SOC implementation"
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index 8d830da..db43142 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -134,8 +134,8 @@
 	default "$(dt_chosen_label,$(DT_CHOSEN_Z_BT_MON_UART))" if HAS_DTS
 	default "UART_0"
 	help
-	 This option specifies the name of UART device to be used
-	 for the Bluetooth monitor logging.
+	  This option specifies the name of UART device to be used
+	  for the Bluetooth monitor logging.
 
 config BT_DEBUG_HCI_DRIVER
 	bool "Bluetooth HCI driver debug"
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 2ec0975..4055baa 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -67,13 +67,13 @@
 	bool "GATT Enforce change-unaware state"
 	depends on BT_GATT_CACHING
 	help
-	 When enable this option blocks notification and indications to client
-	 to conform to the following statement from the Bluetooth 5.1
-	 specification:
-	 '...the server shall not send notifications and indications to such
-	 a client until it becomes change-aware."
-	 In case the service cannot deal with sudden errors (-EAGAIN) then it
-	 shall not use this option.
+	  When enable this option blocks notification and indications to client
+	  to conform to the following statement from the Bluetooth 5.1
+	  specification:
+	  '...the server shall not send notifications and indications to such
+	  a client until it becomes change-aware."
+	  In case the service cannot deal with sudden errors (-EAGAIN) then it
+	  shall not use this option.
 
 config BT_GATT_CLIENT
 	bool "GATT client support"
diff --git a/subsys/bluetooth/services/Kconfig b/subsys/bluetooth/services/Kconfig
index 5000256..9593f38 100644
--- a/subsys/bluetooth/services/Kconfig
+++ b/subsys/bluetooth/services/Kconfig
@@ -17,4 +17,4 @@
 
 endmenu
 
-endif #BT_CONN
+endif # BT_CONN
diff --git a/subsys/bluetooth/services/Kconfig.bas b/subsys/bluetooth/services/Kconfig.bas
index 056dc05..189c786 100644
--- a/subsys/bluetooth/services/Kconfig.bas
+++ b/subsys/bluetooth/services/Kconfig.bas
@@ -26,4 +26,4 @@
 	  3 INFO, write LOG_INF in addition to previous levels
 	  4 DEBUG, write LOG_DBG in addition to previous levels
 
-endif #BT_GATT_BAS
+endif # BT_GATT_BAS
diff --git a/subsys/bluetooth/services/Kconfig.dis b/subsys/bluetooth/services/Kconfig.dis
index 9751ffc..663fb07 100644
--- a/subsys/bluetooth/services/Kconfig.dis
+++ b/subsys/bluetooth/services/Kconfig.dis
@@ -13,7 +13,7 @@
 config BT_GATT_DIS_SETTINGS
 	bool "Enable Settings usage in Device Information Service"
 	help
-	 Enable Settings usage in Device Information Service.
+	  Enable Settings usage in Device Information Service.
 
 config BT_GATT_DIS_STR_MAX
 	int "Maximum size in bytes for DIS strings"
@@ -28,19 +28,19 @@
 	string "Model name"
 	default SOC
 	help
-	 The device model inside Device Information Service.
+	  The device model inside Device Information Service.
 
 config BT_GATT_DIS_MANUF
 	string "Manufacturer name"
 	default "Manufacturer"
 	help
-	 The device manufacturer inside Device Information Service.
+	  The device manufacturer inside Device Information Service.
 
 config BT_GATT_DIS_PNP
 	bool "Enable PnP_ID characteristic"
 	default y
 	help
-	 Enable PnP_ID characteristic in Device Information Service.
+	  Enable PnP_ID characteristic in Device Information Service.
 
 if BT_GATT_DIS_PNP
 
@@ -49,97 +49,98 @@
 	range 1 2
 	default 1
 	help
-	 The Vendor ID Source field designates which organization assigned the
-	 value used in the Vendor ID field value.
-	 The possible values are:
-	 - 1 Bluetooth SIG, the Vendor ID was assigned by the Bluetooth SIG
-	 - 2 USB IF, the Vendor ID was assigned by the USB IF
+	  The Vendor ID Source field designates which organization assigned the
+	  value used in the Vendor ID field value.
+	  The possible values are:
+	  - 1 Bluetooth SIG, the Vendor ID was assigned by the Bluetooth SIG
+	  - 2 USB IF, the Vendor ID was assigned by the USB IF
 
 config BT_GATT_DIS_PNP_VID
 	hex "Vendor ID"
 	range 0 0xFFFF
 	default 0
 	help
-	 The Vendor ID field is intended to uniquely identify the vendor of the
-	 device. This field is used in conjunction with Vendor ID Source field,
-	 which determines which organization assigned the Vendor ID field value.
-	 Note: The Bluetooth Special Interest Group assigns Device ID Vendor ID,
-	 and the USB Implementers Forum assigns Vendor IDs,
-	 either of which can be used for the Vendor ID field value.
-	 Device providers should procure the Vendor ID from the USB Implementers
-	 Forum or the Company Identifier from the Bluetooth SIG.
+	  The Vendor ID field is intended to uniquely identify the vendor of the
+	  device. This field is used in conjunction with Vendor ID Source field,
+	  which determines which organization assigned the Vendor ID field value.
+	  Note: The Bluetooth Special Interest Group assigns Device ID Vendor ID,
+	  and the USB Implementers Forum assigns Vendor IDs,
+	  either of which can be used for the Vendor ID field value.
+	  Device providers should procure the Vendor ID from the USB Implementers
+	  Forum or the Company Identifier from the Bluetooth SIG.
 
 config BT_GATT_DIS_PNP_PID
 	hex "Product ID"
 	range 0 0xFFFF
 	default 0
 	help
-	 The Product ID field is intended to distinguish between different products
-	 made by the vendor identified with the Vendor ID field. The vendors
-	 themselves manage Product ID field values.
+	  The Product ID field is intended to distinguish between different products
+	  made by the vendor identified with the Vendor ID field. The vendors
+	  themselves manage Product ID field values.
 
 config BT_GATT_DIS_PNP_VER
 	hex "Product Version"
 	range 0 0xFFFF
 	default 1
 	help
-	 The Product Version field is a numeric expression identifying the device
-	 release number in Binary-Coded Decimal. This is a vendor-assigned value,
-	 which defines the version of the product identified by the Vendor ID and
-	 Product ID fields. This field is intended to differentiate between
-	 versions of products with identical Vendor IDs and Product IDs.
-	 The value of the field value is 0xJJMN for version JJ.M.N
-	 (JJ - major version number, M - minor version number,
-	 N - sub-minor version number); e.g., version 2.1.3 is represented with
-	 value 0x0213 and version 2.0.0 is represented with a value of 0x0200.
-	 When upward-compatible changes are made to the device, it is recommended
-	 that the minor version number be incremented. If incompatible changes are
-	 made to the device, it is recommended that the major version number be
-	 incremented. The sub-minor version is incremented for bug fixes.
+	  The Product Version field is a numeric expression identifying the device
+	  release number in Binary-Coded Decimal. This is a vendor-assigned value,
+	  which defines the version of the product identified by the Vendor ID and
+	  Product ID fields. This field is intended to differentiate between
+	  versions of products with identical Vendor IDs and Product IDs.
+	  The value of the field value is 0xJJMN for version JJ.M.N
+	  (JJ - major version number, M - minor version number,
+	  N - sub-minor version number); e.g., version 2.1.3 is represented with
+	  value 0x0213 and version 2.0.0 is represented with a value of 0x0200.
+	  When upward-compatible changes are made to the device, it is recommended
+	  that the minor version number be incremented. If incompatible changes are
+	  made to the device, it is recommended that the major version number be
+	  incremented. The sub-minor version is incremented for bug fixes.
 
-endif #BT_GATT_DIS_PNP
+endif # BT_GATT_DIS_PNP
 
 config BT_GATT_DIS_SERIAL_NUMBER
 	bool "Enable DIS Serial number characteristic"
 	help
-	 Enable Serial Number characteristic in Device Information Service.
+	  Enable Serial Number characteristic in Device Information Service.
 
 config BT_GATT_DIS_SERIAL_NUMBER_STR
 	string "Serial Number"
 	depends on BT_GATT_DIS_SERIAL_NUMBER
 	help
-	 Enable Serial Number characteristic in Device Information Service.
+	  Enable Serial Number characteristic in Device Information Service.
 
 config BT_GATT_DIS_FW_REV
 	bool "Enable DIS Firmware Revision characteristic"
 	help
-	 Enable Firmware Revision characteristic in Device Information Service.
+	  Enable Firmware Revision characteristic in Device Information Service.
 
 config BT_GATT_DIS_FW_REV_STR
 	string "Firmware revision"
 	depends on BT_GATT_DIS_FW_REV
 	help
-	 Enable firmware revision characteristic in Device Information Service.
+	  Enable firmware revision characteristic in Device Information Service.
 
 config BT_GATT_DIS_HW_REV
 	bool "Enable DIS Hardware Revision characteristic"
 	help
-	 Enable Hardware Revision characteristic in Device Information Service.
+	  Enable Hardware Revision characteristic in Device Information Service.
 
 config BT_GATT_DIS_HW_REV_STR
 	string "Hardware revision"
 	depends on BT_GATT_DIS_HW_REV
 	help
-	 Enable hardware revision characteristic in Device Information Service.
+	  Enable hardware revision characteristic in Device Information Service.
 
 config BT_GATT_DIS_SW_REV
 	bool "Enable DIS Software Revision characteristic"
 	help
-	 Enable Software Revision characteristic in Device Information Service.
+	  Enable Software Revision characteristic in Device Information Service.
 
 config BT_GATT_DIS_SW_REV_STR
 	string "Software revision"
 	depends on BT_GATT_DIS_SW_REV
 	help
-	 Enable software revision characteristic in Device Information Service.
-endif #BT_GATT_DIS
+	  Enable software revision characteristic in Device Information Service.
+
+endif # BT_GATT_DIS
diff --git a/subsys/bluetooth/services/Kconfig.hrs b/subsys/bluetooth/services/Kconfig.hrs
index f3a7730..7b49919 100644
--- a/subsys/bluetooth/services/Kconfig.hrs
+++ b/subsys/bluetooth/services/Kconfig.hrs
@@ -25,4 +25,4 @@
 	  3 INFO, write LOG_INF in addition to previous levels
 	  4 DEBUG, write LOG_DBG in addition to previous levels
 
-endif #BT_GATT_BAS
+endif # BT_GATT_BAS
diff --git a/subsys/cpp/Kconfig b/subsys/cpp/Kconfig
index 473b3df..c0ead3d 100644
--- a/subsys/cpp/Kconfig
+++ b/subsys/cpp/Kconfig
@@ -73,6 +73,6 @@
 	  Use Zephyr implementation for operator new, delete, pure virtual
 	  functions and vtables.
 
-endif #LIB_CPLUSPLUS
+endif # LIB_CPLUSPLUS
 
 endif # CPLUSPLUS
diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index 6a24273..ce1b158 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -56,10 +56,10 @@
 	depends on MCUBOOT_IMG_MANAGER
 	select FLASH_PAGE_LAYOUT
 	help
-	 If enabled, flash is erased as necessary when receiving new firmware,
-	 instead of erasing the whole image slot at once. This is necessary
-	 on some hardware that has long erase times, to prevent long wait
-	 times at the beginning of the DFU process.
+	  If enabled, flash is erased as necessary when receiving new firmware,
+	  instead of erasing the whole image slot at once. This is necessary
+	  on some hardware that has long erase times, to prevent long wait
+	  times at the beginning of the DFU process.
 
 module = IMG_MANAGER
 module-str = image manager
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
index c4055eb..1c7dc71 100644
--- a/subsys/fs/Kconfig
+++ b/subsys/fs/Kconfig
@@ -109,22 +109,22 @@
 	default 64
 
 config NFFS_FILESYSTEM_MAX_AREAS
-        int "Maximum number of areas"
-        range 2 64
-        default 8
-        help
-          This defines maximum number of areas located on flash. Each area can
-          be erased without affecting other areas thus the size of area can
-          affect performance of GC where single area has to be rewritten.
-          At least one scratch and one non-scratch area is required.
+	int "Maximum number of areas"
+	range 2 64
+	default 8
+	help
+	  This defines maximum number of areas located on flash. Each area can
+	  be erased without affecting other areas thus the size of area can
+	  affect performance of GC where single area has to be rewritten.
+	  At least one scratch and one non-scratch area is required.
 
 config NFFS_FILESYSTEM_MAX_BLOCK_SIZE
-        int "Maximum block size"
-        range 16 2048
-        default 2048
-        help
-          This determines the maximum size of data block written to flash.
-          Writes larger than this size are split into multiple write operations.
+	int "Maximum block size"
+	range 16 2048
+	default 2048
+	help
+	  This determines the maximum size of data block written to flash.
+	  Writes larger than this size are split into multiple write operations.
 
 endmenu
 
diff --git a/subsys/mgmt/Kconfig.mcumgr b/subsys/mgmt/Kconfig.mcumgr
index 199b894..a60d4d8 100644
--- a/subsys/mgmt/Kconfig.mcumgr
+++ b/subsys/mgmt/Kconfig.mcumgr
@@ -65,7 +65,7 @@
 menuconfig MCUMGR_CMD_LOG_MGMT
 	bool "Enable mcumgr handlers for log management"
 	help
-	Enables mcumgr handlers for log management
+	  Enables mcumgr handlers for log management
 
 if MCUMGR_CMD_LOG_MGMT
 config LOG_MGMT_CHUNK_SIZE
diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index bd6e192..5a0875f 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -238,14 +238,14 @@
 	  would need to populate the routing table. RPL used to do that
 	  earlier but currently there is no RPL support in Zephyr.
 
-config	NET_MAX_ROUTES
+config NET_MAX_ROUTES
 	int "Max number of routing entries stored."
 	default NET_IPV6_MAX_NEIGHBORS
 	depends on NET_ROUTE
 	help
 	  This determines how many entries can be stored in routing table.
 
-config	NET_MAX_NEXTHOPS
+config NET_MAX_NEXTHOPS
 	int "Max number of next hop entries stored."
 	default NET_MAX_ROUTES
 	depends on NET_ROUTE
@@ -256,7 +256,7 @@
 	bool
 	depends on NET_ROUTE
 
-config	NET_MAX_MCAST_ROUTES
+config NET_MAX_MCAST_ROUTES
 	int "Max number of multicast routing entries stored."
 	default 1
 	depends on NET_ROUTE_MCAST
@@ -586,8 +586,8 @@
 	default 2048
 	depends on NET_BUF_VARIABLE_DATA_SIZE
 	help
-	 This value tell what is the size of the memory pool where each
-	 network buffer is allocated from.
+	  This value tell what is the size of the memory pool where each
+	  network buffer is allocated from.
 
 config NET_HEADERS_ALWAYS_CONTIGUOUS
 	bool
diff --git a/subsys/net/l2/Kconfig b/subsys/net/l2/Kconfig
index 9b1d387..fa34047 100644
--- a/subsys/net/l2/Kconfig
+++ b/subsys/net/l2/Kconfig
@@ -85,7 +85,7 @@
 	select NET_MGMT_EVENT
 	select NET_MGMT_EVENT_INFO
 	help
-	Add support for Wi-Fi Management interface.
+	  Add support for Wi-Fi Management interface.
 
 if NET_L2_WIFI_MGMT
 module = NET_L2_WIFI_MGMT
diff --git a/subsys/net/l2/canbus/Kconfig b/subsys/net/l2/canbus/Kconfig
index 6d8556d..0f999cf 100644
--- a/subsys/net/l2/canbus/Kconfig
+++ b/subsys/net/l2/canbus/Kconfig
@@ -70,7 +70,8 @@
 module-str = Log level for CANbus L2 layer
 module-help = Enables CANbus L2 to output debug messages.
 source "subsys/net/Kconfig.template.log_config.net"
-endif #NET_L2_CANBUS
+
+endif # NET_L2_CANBUS
 
 config NET_L2_CANBUS_RAW
 	bool "Enable CANBUS RAW l2 layer"
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index 4158fbd..b2d1103 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -190,14 +190,14 @@
 	  Pre Shared Key for the Device to start joiner
 
 config OPENTHREAD_DHCP6_CLIENT
-       bool "DHCPv6 client support"
-       help
-         Enable DHCPv6 client capability in OpenThread stack
+	bool "DHCPv6 client support"
+	help
+	  Enable DHCPv6 client capability in OpenThread stack
 
 config OPENTHREAD_DHCP6_SERVER
-       bool "DHCPv6 server support"
-       help
-         Enable DHCPv6 server capability in OpenThread stack
+	bool "DHCPv6 server support"
+	help
+	  Enable DHCPv6 server capability in OpenThread stack
 
 config OPENTHREAD_PLATFORM_INFO
 	string "Platform information for OpenThread"
diff --git a/subsys/net/lib/lwm2m/Kconfig b/subsys/net/lib/lwm2m/Kconfig
index 671dd4a..445cf6d 100644
--- a/subsys/net/lib/lwm2m/Kconfig
+++ b/subsys/net/lib/lwm2m/Kconfig
@@ -35,8 +35,8 @@
 	default 2560 if NET_LOG
 	default 2048
 	help
-	 Set the stack size for the LWM2M library engine (used for handling
-	 OBSERVE and NOTIFY events)
+	  Set the stack size for the LWM2M library engine (used for handling
+	  OBSERVE and NOTIFY events)
 
 config LWM2M_ENGINE_MAX_MESSAGES
 	int "LWM2M engine max. message object"
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index acf98ce..f0708a2 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -35,9 +35,9 @@
 	default 3000
 	range 0 60000
 	help
-	 This variable specifies time in milliseconds after connect()
-	 API call will timeout if we have not received SYN-ACK from
-	 peer.
+	  This variable specifies time in milliseconds after connect()
+	  API call will timeout if we have not received SYN-ACK from
+	  peer.
 
 config NET_SOCKETS_DNS_TIMEOUT
 	int "Timeout value in milliseconds for DNS queries"
diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index c14451b..399b71a 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -112,7 +112,7 @@
 	help
 	  Number of bytes dedicated for storing executed commands.
 
-endif #SHELL_HISTORY
+endif # SHELL_HISTORY
 
 config SHELL_STATS
 	bool "Enable shell statistics"
diff --git a/subsys/shell/Kconfig.backends b/subsys/shell/Kconfig.backends
index 80dba27..1aa17eb 100644
--- a/subsys/shell/Kconfig.backends
+++ b/subsys/shell/Kconfig.backends
@@ -113,7 +113,7 @@
 	default 4 if SHELL_BACKEND_SERIAL_LOG_LEVEL_DBG
 	default 5 if SHELL_BACKEND_SERIAL_LOG_LEVEL_DEFAULT
 
-endif #SHELL_BACKEND_SERIAL
+endif # SHELL_BACKEND_SERIAL
 
 config SHELL_BACKEND_RTT
 	bool "Enable RTT backend"
@@ -180,7 +180,7 @@
 module-str = RTT shell backend
 source "subsys/logging/Kconfig.template.log_config"
 
-endif #SHELL_BACKEND_RTT
+endif # SHELL_BACKEND_RTT
 
 config SHELL_BACKEND_TELNET
 	bool "Enable TELNET backend."
diff --git a/subsys/usb/class/netusb/Kconfig b/subsys/usb/class/netusb/Kconfig
index cd7ab31..2cf7f8f 100644
--- a/subsys/usb/class/netusb/Kconfig
+++ b/subsys/usb/class/netusb/Kconfig
@@ -66,7 +66,7 @@
 	int
 	default 64
 
-endif #USB_DEVICE_NETWORK_EEM
+endif # USB_DEVICE_NETWORK_EEM
 
 if USB_DEVICE_NETWORK_RNDIS