diff --git a/Kconfig b/Kconfig
index 94a9afe..7cfc730 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig - general configuration options
+# General configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 mainmenu "Zephyr Kernel Configuration"
 
 source "Kconfig.zephyr"
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index bd17a0b..4ca994a 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -1,11 +1,8 @@
-# Kconfig - general configuration options
+# General configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Modules"
 
diff --git a/arch/Kconfig b/arch/Kconfig
index 828ba24..a801946 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1,12 +1,9 @@
-# Kconfig - general architecture configuration options
+# General architecture configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2015 Intel Corporation
 # Copyright (c) 2016 Cadence Design Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index fce4419..4f8c2c6 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -1,10 +1,7 @@
 # ARC options
 
-#
 # Copyright (c) 2014, 2019 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "ARC Options"
 	depends on ARC
diff --git a/arch/arc/core/mpu/Kconfig b/arch/arc/core/mpu/Kconfig
index 7356118..07f2256 100644
--- a/arch/arc/core/mpu/Kconfig
+++ b/arch/arc/core/mpu/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig - Memory Protection Unit (MPU) configuration options
+# Memory Protection Unit (MPU) configuration options
 
-#
 # Copyright (c) 2017 Synopsys
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config ARC_MPU_VER
 	int "ARC MPU version"
 	range 2 4
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ccb1dbf..07d01d3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,11 +1,7 @@
-# Kconfig - ARM architecture configuration options
+# ARM architecture configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menu "ARM Options"
 	depends on ARM
diff --git a/arch/arm/core/Kconfig b/arch/arm/core/Kconfig
index cb9337a..3b863fa 100644
--- a/arch/arm/core/Kconfig
+++ b/arch/arm/core/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - ARM core configuration options
+# ARM core configuration options
 
-#
 # Copyright (c) 2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CPU_CORTEX
 	bool
diff --git a/arch/arm/core/cortex_m/Kconfig b/arch/arm/core/cortex_m/Kconfig
index b89213d..084e877 100644
--- a/arch/arm/core/cortex_m/Kconfig
+++ b/arch/arm/core/cortex_m/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - ARM Cortex-M platform configuration options
+# ARM Cortex-M platform configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # NOTE: We have the specific core implementations first and outside of the
 # if CPU_CORTEX_M block so that SoCs can select which core they are using
diff --git a/arch/arm/core/cortex_m/mpu/Kconfig b/arch/arm/core/cortex_m/mpu/Kconfig
index 52986e0..f55604e 100644
--- a/arch/arm/core/cortex_m/mpu/Kconfig
+++ b/arch/arm/core/cortex_m/mpu/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Memory Protection Unit (MPU) configuration options
+# Memory Protection Unit (MPU) configuration options
 
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if CPU_HAS_MPU
 
diff --git a/arch/arm/core/cortex_m/tz/Kconfig b/arch/arm/core/cortex_m/tz/Kconfig
index 980a323..cc5ca3b 100644
--- a/arch/arm/core/cortex_m/tz/Kconfig
+++ b/arch/arm/core/cortex_m/tz/Kconfig
@@ -1,8 +1,6 @@
-# Kconfig - ARM TrustZone-M core configuration options
+# ARM TrustZone-M core configuration options
 
-#
 # Copyright (c) 2018 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ARM_TRUSTZONE_M
diff --git a/arch/arm/core/cortex_r/Kconfig b/arch/arm/core/cortex_r/Kconfig
index 366db5e..a543b5d 100644
--- a/arch/arm/core/cortex_r/Kconfig
+++ b/arch/arm/core/cortex_r/Kconfig
@@ -1,11 +1,8 @@
-# Kconfig - ARM Cortex-R platform configuration options
+# ARM Cortex-R platform configuration options
 
-#
 # Copyright (c) 2018 Marvell
 # Copyright (c) 2018 Lexmark International, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # NOTE: We have the specific core implementations first and outside of the
 # if CPU_CORTEX_R block so that SoCs can select which core they are using
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 9ca8309..f64fd7a 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Nios II Options"
 	depends on NIOS2
diff --git a/arch/posix/Kconfig b/arch/posix/Kconfig
index 68d8ed2..e76446d 100644
--- a/arch/posix/Kconfig
+++ b/arch/posix/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - General configuration options
+# General configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "POSIX (native) Options"
 	depends on ARCH_POSIX
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 02f3d31..1945e4f 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "RISCV Options"
 	depends on RISCV
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index aa2811e..2f41723 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,5 +1,5 @@
-# Kconfig - x86 general configuration options
-#
+# x86 general configuration options
+
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/arch/x86/core/Kconfig.ia32 b/arch/x86/core/Kconfig.ia32
index 3b62466..d534271 100644
--- a/arch/x86/core/Kconfig.ia32
+++ b/arch/x86/core/Kconfig.ia32
@@ -1,5 +1,5 @@
-# Kconfig.ia32 - IA32-specific X86 subarchitecture options
-#
+# IA32-specific X86 subarchitecture options
+
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/arch/x86/core/Kconfig.intel64 b/arch/x86/core/Kconfig.intel64
index 0a6216f..ba01776 100644
--- a/arch/x86/core/Kconfig.intel64
+++ b/arch/x86/core/Kconfig.intel64
@@ -1,5 +1,5 @@
-# Kconfig.intel64 - Intel64-specific X86 subarchitecture options
-#
+# Intel64-specific X86 subarchitecture options
+
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2876e8a..ba1678d 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,5 +1,5 @@
-# Kconfig - XTENSA architecture configuration options
-#
+# XTENSA architecture configuration options
+
 # Copyright (c) 2016 Cadence Design Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arc/em_starterkit/Kconfig b/boards/arc/em_starterkit/Kconfig
index 6516083..4aff83f 100644
--- a/boards/arc/em_starterkit/Kconfig
+++ b/boards/arc/em_starterkit/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - DesignWare ARC EM Starter Kit board configuration options
+# DesignWare ARC EM Starter Kit board configuration options
 
-#
 # Copyright (c) 2017 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EM_STARTERKIT
 
diff --git a/boards/arc/em_starterkit/Kconfig.board b/boards/arc/em_starterkit/Kconfig.board
index 61cacee..dd7da9f 100644
--- a/boards/arc/em_starterkit/Kconfig.board
+++ b/boards/arc/em_starterkit/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - DesignWare ARC EM Starter Kit board configuration
-#
+# DesignWare ARC EM Starter Kit board configuration
+
 # Copyright (c) 2016 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_EM_STARTERKIT
 	bool "ARC EM Starter Kit"
 	depends on SOC_EMSK
diff --git a/boards/arc/emsdp/Kconfig.board b/boards/arc/emsdp/Kconfig.board
index 05e874d..c27a4d2 100644
--- a/boards/arc/emsdp/Kconfig.board
+++ b/boards/arc/emsdp/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - DesignWare ARC EM Software Development Platform board configuration
-#
+# DesignWare ARC EM Software Development Platform board configuration
+
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_EMSDP
 	bool "EM Software Development Platform"
 	depends on SOC_ARC_EMSDP
diff --git a/boards/arc/emsdp/Kconfig.defconfig b/boards/arc/emsdp/Kconfig.defconfig
index fa347d2..c2fded2 100644
--- a/boards/arc/emsdp/Kconfig.defconfig
+++ b/boards/arc/emsdp/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - DesignWare ARC EM Software Development Platform board configuration
-#
+# DesignWare ARC EM Software Development Platform board configuration
+
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EMSDP
 
diff --git a/boards/arc/hsdk/Kconfig.board b/boards/arc/hsdk/Kconfig.board
index 62254cf..975d2f5 100644
--- a/boards/arc/hsdk/Kconfig.board
+++ b/boards/arc/hsdk/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - DesignWare ARC HS Development Kit board configuration
-#
+# DesignWare ARC HS Development Kit board configuration
+
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_HSDK
 	bool "ARC HS Development Kit"
 	depends on SOC_ARC_HSDK
diff --git a/boards/arc/hsdk/Kconfig.defconfig b/boards/arc/hsdk/Kconfig.defconfig
index faf3f4a..7ce8eb3 100644
--- a/boards/arc/hsdk/Kconfig.defconfig
+++ b/boards/arc/hsdk/Kconfig.defconfig
@@ -1,6 +1,4 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_HSDK
diff --git a/boards/arc/iotdk/Kconfig.board b/boards/arc/iotdk/Kconfig.board
index 57d6427..a92c55e 100644
--- a/boards/arc/iotdk/Kconfig.board
+++ b/boards/arc/iotdk/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - DesignWare ARC IoT Development Kit board configuration
-#
+# DesignWare ARC IoT Development Kit board configuration
+
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_IOTDK
 	bool "ARC IoT Development Kit"
 	depends on SOC_ARC_IOT
diff --git a/boards/arc/nsim/Kconfig.board b/boards/arc/nsim/Kconfig.board
index 763ba0b..39acb48 100644
--- a/boards/arc/nsim/Kconfig.board
+++ b/boards/arc/nsim/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - DesignWare ARC nSIM simulated platform configuration
-#
+# DesignWare ARC nSIM simulated platform configuration
+
 # Copyright (c) 2016, 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_NSIM
 	bool "ARC nSIM simulator"
 	depends on SOC_NSIM
diff --git a/boards/arm/96b_argonkey/Kconfig.board b/boards/arm/96b_argonkey/Kconfig.board
index e9daf00..948e5b9 100644
--- a/boards/arm/96b_argonkey/Kconfig.board
+++ b/boards/arm/96b_argonkey/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - 96Boards Argonkey Board Configuration
-#
+# 96Boards Argonkey Board Configuration
+
 # Copyright (c) 2018 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_96B_ARGONKEY
 	bool "96Boards Argonkey"
 	depends on SOC_STM32F412CG
diff --git a/boards/arm/96b_argonkey/Kconfig.defconfig b/boards/arm/96b_argonkey/Kconfig.defconfig
index 21b3500..916d799 100644
--- a/boards/arm/96b_argonkey/Kconfig.defconfig
+++ b/boards/arm/96b_argonkey/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Argonkey Board Configuration
-#
+# 96Boards Argonkey Board Configuration
+
 # Copyright (c) 2018 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_ARGONKEY
 
diff --git a/boards/arm/96b_avenger96/Kconfig.board b/boards/arm/96b_avenger96/Kconfig.board
index fd3ce08..78012ba 100644
--- a/boards/arm/96b_avenger96/Kconfig.board
+++ b/boards/arm/96b_avenger96/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Avenger96 board configuration
-#
+# 96Boards Avenger96 board configuration
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_96B_AVENGER96
 	bool "96Boards Avenger96 Board"
diff --git a/boards/arm/96b_avenger96/Kconfig.defconfig b/boards/arm/96b_avenger96/Kconfig.defconfig
index 0452ae8..befc337 100644
--- a/boards/arm/96b_avenger96/Kconfig.defconfig
+++ b/boards/arm/96b_avenger96/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Avenger96 board configuration
-#
+# 96Boards Avenger96 board configuration
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_AVENGER96
 
diff --git a/boards/arm/96b_carbon/Kconfig.board b/boards/arm/96b_carbon/Kconfig.board
index 001cad0..fc9e1d5 100644
--- a/boards/arm/96b_carbon/Kconfig.board
+++ b/boards/arm/96b_carbon/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - 96boards Carbon STMF401RE board configuration
-#
+# 96boards Carbon STMF401RE board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_96B_CARBON
 	bool "96Boards Carbon (STM32F401)"
diff --git a/boards/arm/96b_carbon/Kconfig.defconfig b/boards/arm/96b_carbon/Kconfig.defconfig
index a6e5513..0f60c63 100644
--- a/boards/arm/96b_carbon/Kconfig.defconfig
+++ b/boards/arm/96b_carbon/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96boards Carbon board configuration
-#
+# 96boards Carbon board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_CARBON
 
diff --git a/boards/arm/96b_carbon_nrf51/Kconfig.board b/boards/arm/96b_carbon_nrf51/Kconfig.board
index 8a56f0a..71833ec 100644
--- a/boards/arm/96b_carbon_nrf51/Kconfig.board
+++ b/boards/arm/96b_carbon_nrf51/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - 96Boards Carbon nRF51 board configuration
-#
+# 96Boards Carbon nRF51 board configuration
+
 # Copyright (c) 2016, 2017 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_96B_CARBON_NRF51
diff --git a/boards/arm/96b_carbon_nrf51/Kconfig.defconfig b/boards/arm/96b_carbon_nrf51/Kconfig.defconfig
index 8092977..8787531 100644
--- a/boards/arm/96b_carbon_nrf51/Kconfig.defconfig
+++ b/boards/arm/96b_carbon_nrf51/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - 96Boards Carbon nRF51 board default configuration
-#
+# 96Boards Carbon nRF51 board default configuration
+
 # Copyright (c) 2016, 2017 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_96B_CARBON_NRF51
diff --git a/boards/arm/96b_meerkat96/Kconfig.board b/boards/arm/96b_meerkat96/Kconfig.board
index 08589fb..85c6c55 100644
--- a/boards/arm/96b_meerkat96/Kconfig.board
+++ b/boards/arm/96b_meerkat96/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Meerkat96 board
-#
+# 96Boards Meerkat96 board
+
 # Copyright (c) 2019, Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_96B_MEERKAT96
 	bool "96Boards Meerkat96 board"
diff --git a/boards/arm/96b_meerkat96/Kconfig.defconfig b/boards/arm/96b_meerkat96/Kconfig.defconfig
index 2710bdc..aca8df8 100644
--- a/boards/arm/96b_meerkat96/Kconfig.defconfig
+++ b/boards/arm/96b_meerkat96/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Meerkat96 board
-#
+# 96Boards Meerkat96 board
+
 # Copyright (c) 2019, Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_MEERKAT96
 
diff --git a/boards/arm/96b_neonkey/Kconfig.board b/boards/arm/96b_neonkey/Kconfig.board
index 0b8fb78..2246b44 100644
--- a/boards/arm/96b_neonkey/Kconfig.board
+++ b/boards/arm/96b_neonkey/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - 96Boards Neonkey Board Configuration
-#
+# 96Boards Neonkey Board Configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_96B_NEONKEY
 	bool "96Boards Neonkey"
 	depends on SOC_STM32F411XE
diff --git a/boards/arm/96b_neonkey/Kconfig.defconfig b/boards/arm/96b_neonkey/Kconfig.defconfig
index ce1bcf9..6d2e451 100644
--- a/boards/arm/96b_neonkey/Kconfig.defconfig
+++ b/boards/arm/96b_neonkey/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards Neonkey Board Configuration
-#
+# 96Boards Neonkey Board Configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_NEONKEY
 
diff --git a/boards/arm/96b_nitrogen/Kconfig b/boards/arm/96b_nitrogen/Kconfig
index a7be31b..acaec81 100644
--- a/boards/arm/96b_nitrogen/Kconfig
+++ b/boards/arm/96b_nitrogen/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - 96Boards NITROGEN board configuration
-#
+# 96Boards NITROGEN board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_96B_NITROGEN
diff --git a/boards/arm/96b_nitrogen/Kconfig.board b/boards/arm/96b_nitrogen/Kconfig.board
index 863c37b..a771ff2 100644
--- a/boards/arm/96b_nitrogen/Kconfig.board
+++ b/boards/arm/96b_nitrogen/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - 96Boards NITROGEN board configuration
-#
+# 96Boards NITROGEN board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_96B_NITROGEN
diff --git a/boards/arm/96b_nitrogen/Kconfig.defconfig b/boards/arm/96b_nitrogen/Kconfig.defconfig
index ce6ac97..8536c3a 100644
--- a/boards/arm/96b_nitrogen/Kconfig.defconfig
+++ b/boards/arm/96b_nitrogen/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - 96Boards NITROGEN board configuration
-#
+# 96Boards NITROGEN board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_96B_NITROGEN
diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.board b/boards/arm/96b_stm32_sensor_mez/Kconfig.board
index a33c870..3d17d09 100644
--- a/boards/arm/96b_stm32_sensor_mez/Kconfig.board
+++ b/boards/arm/96b_stm32_sensor_mez/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards STM32 Sensor Mezzanine board configuration
-#
+# 96Boards STM32 Sensor Mezzanine board configuration
+
 # Copyright (c) 2018 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_96B_STM32_SENSOR_MEZ
 	bool "96Boards STM32 Sensor Mezzanine Board"
diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig b/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig
index 5e2722b..e0fb5be 100644
--- a/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig
+++ b/boards/arm/96b_stm32_sensor_mez/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96Boards STM32 Sensor Mezzanine board configuration
-#
+# 96Boards STM32 Sensor Mezzanine board configuration
+
 # Copyright (c) 2018 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_STM32_SENSOR_MEZ
 
diff --git a/boards/arm/96b_wistrio/Kconfig.board b/boards/arm/96b_wistrio/Kconfig.board
index de973cb..ac527a6 100644
--- a/boards/arm/96b_wistrio/Kconfig.board
+++ b/boards/arm/96b_wistrio/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - 96boards WisTrio board configuration
-#
+# 96boards WisTrio board configuration
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_96B_WISTRIO
 	bool "96boards WisTrio Development Board"
diff --git a/boards/arm/96b_wistrio/Kconfig.defconfig b/boards/arm/96b_wistrio/Kconfig.defconfig
index 3a37879..234370c 100644
--- a/boards/arm/96b_wistrio/Kconfig.defconfig
+++ b/boards/arm/96b_wistrio/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - 96boards WisTrio board configuration
-#
+# 96boards WisTrio board configuration
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_96B_WISTRIO
 
diff --git a/boards/arm/actinius_icarus/Kconfig b/boards/arm/actinius_icarus/Kconfig
index 66c2a91..aa3dd0a 100644
--- a/boards/arm/actinius_icarus/Kconfig
+++ b/boards/arm/actinius_icarus/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Actinius Icarus board configuration
-#
+# Actinius Icarus board configuration
+
 # Copyright (c) 2019 Actinius
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS
diff --git a/boards/arm/actinius_icarus/Kconfig.board b/boards/arm/actinius_icarus/Kconfig.board
index fdc2204..bdf4d8e 100644
--- a/boards/arm/actinius_icarus/Kconfig.board
+++ b/boards/arm/actinius_icarus/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Actinius Icarus board configuration
-#
+# Actinius Icarus board configuration
+
 # Copyright (c) 2019 Actinius
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF9160_SICA
diff --git a/boards/arm/actinius_icarus/Kconfig.defconfig b/boards/arm/actinius_icarus/Kconfig.defconfig
index 34df16c..39633b1 100644
--- a/boards/arm/actinius_icarus/Kconfig.defconfig
+++ b/boards/arm/actinius_icarus/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Actinius Icarus board configuration
-#
+# Actinius Icarus board configuration
+
 # Copyright (c) 2019 Actinius
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_ACTINIUS_ICARUS || BOARD_ACTINIUS_ICARUS_NS
diff --git a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board
index 16ab364..9f33d8c 100644
--- a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board
+++ b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Adafruit Feather M0 Basic Proto board configuration
-#
+# Adafruit Feather M0 Basic Proto board configuration
+
 # Copyright (c) 2018 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO
diff --git a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig
index 1643078..ad2c2aa 100644
--- a/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig
+++ b/boards/arm/adafruit_feather_m0_basic_proto/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Adafruit Feather M0 Basic Proto board configuration
-#
+# Adafruit Feather M0 Basic Proto board configuration
+
 # Copyright (c) 2018 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_ADAFRUIT_FEATHER_M0_BASIC_PROTO
diff --git a/boards/arm/adafruit_trinket_m0/Kconfig.board b/boards/arm/adafruit_trinket_m0/Kconfig.board
index 8369b64..302a0da 100644
--- a/boards/arm/adafruit_trinket_m0/Kconfig.board
+++ b/boards/arm/adafruit_trinket_m0/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - Adafruit Trinket M0 board configuration
-#
+# Adafruit Trinket M0 board configuration
+
 # Copyright (c) 2018 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/adafruit_trinket_m0/Kconfig.defconfig b/boards/arm/adafruit_trinket_m0/Kconfig.defconfig
index 14b7973..0db53b4 100644
--- a/boards/arm/adafruit_trinket_m0/Kconfig.defconfig
+++ b/boards/arm/adafruit_trinket_m0/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - Adafruit Trinket M0 board configuration
-#
+# Adafruit Trinket M0 board configuration
+
 # Copyright (c) 2018 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/arduino_due/Kconfig.board b/boards/arm/arduino_due/Kconfig.board
index 5818773..8e0a7ae 100644
--- a/boards/arm/arduino_due/Kconfig.board
+++ b/boards/arm/arduino_due/Kconfig.board
@@ -1,8 +1,7 @@
-# Kconfig - Arduino Due Board configuration
-#
+# Arduino Due Board configuration
+
 # Copyright (c) 2017 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_ARDUINO_DUE
 	bool "Arduino Due Board"
diff --git a/boards/arm/arduino_due/Kconfig.defconfig b/boards/arm/arduino_due/Kconfig.defconfig
index 45b4ddc..29415a1 100644
--- a/boards/arm/arduino_due/Kconfig.defconfig
+++ b/boards/arm/arduino_due/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Arduino Due Board configuration
-#
+# Arduino Due Board configuration
+
 # Copyright (c) 2017 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_ARDUINO_DUE
 
diff --git a/boards/arm/arduino_zero/Kconfig.board b/boards/arm/arduino_zero/Kconfig.board
index c488489..646e402 100644
--- a/boards/arm/arduino_zero/Kconfig.board
+++ b/boards/arm/arduino_zero/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - Arduino Zero Board configuration
-#
+# Arduino Zero Board configuration
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/arduino_zero/Kconfig.defconfig b/boards/arm/arduino_zero/Kconfig.defconfig
index 57fc663..4e6cc13 100644
--- a/boards/arm/arduino_zero/Kconfig.defconfig
+++ b/boards/arm/arduino_zero/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - Arduino Zero board configuration
-#
+# Arduino Zero board configuration
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamd20_xpro/Kconfig.board b/boards/arm/atsamd20_xpro/Kconfig.board
index b539f43..f63891d 100644
--- a/boards/arm/atsamd20_xpro/Kconfig.board
+++ b/boards/arm/atsamd20_xpro/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - SAM D20 Xplained Pro Board configuration
-#
+# SAM D20 Xplained Pro Board configuration
+
 # Copyright (c) 2018 Sean Nyekjaer
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamd20_xpro/Kconfig.defconfig b/boards/arm/atsamd20_xpro/Kconfig.defconfig
index d7ab0f9..7a21bfe 100644
--- a/boards/arm/atsamd20_xpro/Kconfig.defconfig
+++ b/boards/arm/atsamd20_xpro/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - SAM D20 Xplained Pro board configuration
-#
+# SAM D20 Xplained Pro board configuration
+
 # Copyright (c) 2018 Sean Nyekjaer
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamd21_xpro/Kconfig.board b/boards/arm/atsamd21_xpro/Kconfig.board
index 2c72bc2..4070442 100644
--- a/boards/arm/atsamd21_xpro/Kconfig.board
+++ b/boards/arm/atsamd21_xpro/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - SAM D21 Xplained Pro Board configuration
-#
+# SAM D21 Xplained Pro Board configuration
+
 # Copyright (c) 2018 Bryan O'Donoghue
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamd21_xpro/Kconfig.defconfig b/boards/arm/atsamd21_xpro/Kconfig.defconfig
index a3a2db8..878ac23 100644
--- a/boards/arm/atsamd21_xpro/Kconfig.defconfig
+++ b/boards/arm/atsamd21_xpro/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - SAM D21 Xplained Pro board configuration
-#
+# SAM D21 Xplained Pro board configuration
+
 # Copyright (c) 2018 Bryan O'Donoghue
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamr21_xpro/Kconfig.board b/boards/arm/atsamr21_xpro/Kconfig.board
index aa75c85..0293b04 100644
--- a/boards/arm/atsamr21_xpro/Kconfig.board
+++ b/boards/arm/atsamr21_xpro/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - SAM R21 Xplained Pro Board configuration
-#
+# SAM R21 Xplained Pro Board configuration
+
 # Copyright (c) 2019 Benjamin Valentin
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/atsamr21_xpro/Kconfig.defconfig b/boards/arm/atsamr21_xpro/Kconfig.defconfig
index 8f0284b..4f0b72b 100644
--- a/boards/arm/atsamr21_xpro/Kconfig.defconfig
+++ b/boards/arm/atsamr21_xpro/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - SAM R21 Xplained Pro board configuration
-#
+# SAM R21 Xplained Pro board configuration
+
 # Copyright (c) 2019 Benjamin Valentin
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/arm/b_l072z_lrwan1/Kconfig.board b/boards/arm/b_l072z_lrwan1/Kconfig.board
index 01bbab1..27f6dfe 100644
--- a/boards/arm/b_l072z_lrwan1/Kconfig.board
+++ b/boards/arm/b_l072z_lrwan1/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics B-L072Z-LRWAN1 Discovery board configuration
-#
+# STMicroelectronics B-L072Z-LRWAN1 Discovery board configuration
+
 # Copyright (c) 2018 Aleksandr Makarov <aleksandr.o.makarov@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_B_L072Z_LRWAN1
 	bool "STMicroelectronics B-L072Z-LRWAN1 Discovery kit"
diff --git a/boards/arm/b_l072z_lrwan1/Kconfig.defconfig b/boards/arm/b_l072z_lrwan1/Kconfig.defconfig
index 1819073..d9e8676 100644
--- a/boards/arm/b_l072z_lrwan1/Kconfig.defconfig
+++ b/boards/arm/b_l072z_lrwan1/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics B-L072Z-LRWAN1 Discovery board configuration
-#
+# STMicroelectronics B-L072Z-LRWAN1 Discovery board configuration
+
 # Copyright (c) 2018 Aleksandr Makarov <aleksandr.o.makarov@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_B_L072Z_LRWAN1
 
diff --git a/boards/arm/bbc_microbit/Kconfig.board b/boards/arm/bbc_microbit/Kconfig.board
index 4aa4720..758673f 100644
--- a/boards/arm/bbc_microbit/Kconfig.board
+++ b/boards/arm/bbc_microbit/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BBC_MICROBIT board configuration
-#
+# nRF51 BBC_MICROBIT board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_BBC_MICROBIT
diff --git a/boards/arm/bbc_microbit/Kconfig.defconfig b/boards/arm/bbc_microbit/Kconfig.defconfig
index db1e98b..578c8f2 100644
--- a/boards/arm/bbc_microbit/Kconfig.defconfig
+++ b/boards/arm/bbc_microbit/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BBC_MICROBIT board configuration
-#
+# nRF51 BBC_MICROBIT board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_BBC_MICROBIT
diff --git a/boards/arm/bl652_dvk/Kconfig b/boards/arm/bl652_dvk/Kconfig
index 96f9705..f8ad711 100644
--- a/boards/arm/bl652_dvk/Kconfig
+++ b/boards/arm/bl652_dvk/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - BL652 DVK board configuration
-#
+# BL652 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_BL652_DVK
diff --git a/boards/arm/bl652_dvk/Kconfig.board b/boards/arm/bl652_dvk/Kconfig.board
index cfc775e..6967db3 100644
--- a/boards/arm/bl652_dvk/Kconfig.board
+++ b/boards/arm/bl652_dvk/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - BL652 DVK board configuration
-#
+# BL652 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_BL652_DVK
diff --git a/boards/arm/bl652_dvk/Kconfig.defconfig b/boards/arm/bl652_dvk/Kconfig.defconfig
index 194b837..7814d64 100644
--- a/boards/arm/bl652_dvk/Kconfig.defconfig
+++ b/boards/arm/bl652_dvk/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - BL652 DVK board configuration
-#
+# BL652 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_BL652_DVK
diff --git a/boards/arm/bl654_dvk/Kconfig b/boards/arm/bl654_dvk/Kconfig
index 369a13c..9ca1746 100644
--- a/boards/arm/bl654_dvk/Kconfig
+++ b/boards/arm/bl654_dvk/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - BL654 DVK board configuration
-#
+# BL654 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_BL654_DVK
diff --git a/boards/arm/bl654_dvk/Kconfig.board b/boards/arm/bl654_dvk/Kconfig.board
index 6c33d36..85f1099 100644
--- a/boards/arm/bl654_dvk/Kconfig.board
+++ b/boards/arm/bl654_dvk/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - BL654 DVK board configuration
-#
+# BL654 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_BL654_DVK
diff --git a/boards/arm/bl654_dvk/Kconfig.defconfig b/boards/arm/bl654_dvk/Kconfig.defconfig
index 4885fe6..9323125 100644
--- a/boards/arm/bl654_dvk/Kconfig.defconfig
+++ b/boards/arm/bl654_dvk/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - BL654 DVK board configuration
-#
+# BL654 DVK board configuration
+
 # Copyright (c) 2019 Laird Connectivity
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_BL654_DVK
diff --git a/boards/arm/cc1352r1_launchxl/Kconfig.board b/boards/arm/cc1352r1_launchxl/Kconfig.board
index 5ca8b5a..3c874a1 100644
--- a/boards/arm/cc1352r1_launchxl/Kconfig.board
+++ b/boards/arm/cc1352r1_launchxl/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - TI CC1352R LaunchXL board
-#
+# TI CC1352R LaunchXL board
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_CC1352R1_LAUNCHXL
diff --git a/boards/arm/cc1352r1_launchxl/Kconfig.defconfig b/boards/arm/cc1352r1_launchxl/Kconfig.defconfig
index d6bae43..be1fd96 100644
--- a/boards/arm/cc1352r1_launchxl/Kconfig.defconfig
+++ b/boards/arm/cc1352r1_launchxl/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - TI CC1352R LaunchXL board
-#
+# TI CC1352R LaunchXL board
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_CC1352R1_LAUNCHXL
diff --git a/boards/arm/cc2650_sensortag/Kconfig b/boards/arm/cc2650_sensortag/Kconfig
index 9500cc0..2866aac 100644
--- a/boards/arm/cc2650_sensortag/Kconfig
+++ b/boards/arm/cc2650_sensortag/Kconfig
@@ -1,7 +1,6 @@
+# TI CC2650 SensorTag configuration
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig - TI CC2650 SensorTag configuration
-#
 
 if BOARD_CC2650_SENSORTAG
 
diff --git a/boards/arm/cc2650_sensortag/Kconfig.board b/boards/arm/cc2650_sensortag/Kconfig.board
index 9567ae6..928c936 100644
--- a/boards/arm/cc2650_sensortag/Kconfig.board
+++ b/boards/arm/cc2650_sensortag/Kconfig.board
@@ -1,7 +1,6 @@
+# TI SimpleLink CC2650 SensorTag Board
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig - TI SimpleLink CC2650 SensorTag Board
-#
 
 config BOARD_CC2650_SENSORTAG
 	bool "TI CC2650 SensorTag"
diff --git a/boards/arm/cc2650_sensortag/Kconfig.defconfig b/boards/arm/cc2650_sensortag/Kconfig.defconfig
index bc7cd29..5e2019c 100644
--- a/boards/arm/cc2650_sensortag/Kconfig.defconfig
+++ b/boards/arm/cc2650_sensortag/Kconfig.defconfig
@@ -1,7 +1,6 @@
+# TI CC2650 SensorTag board configuration
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig - TI CC2650 SensorTag board configuration
-#
 
 if BOARD_CC2650_SENSORTAG
 
diff --git a/boards/arm/cc26x2r1_launchxl/Kconfig.board b/boards/arm/cc26x2r1_launchxl/Kconfig.board
index 63bd933..cfc9da2 100644
--- a/boards/arm/cc26x2r1_launchxl/Kconfig.board
+++ b/boards/arm/cc26x2r1_launchxl/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - TI CC26x2R1 LaunchXL board
-#
+# TI CC26x2R1 LaunchXL board
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_CC26X2R1_LAUNCHXL
diff --git a/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig b/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig
index 07f3da1..3895763 100644
--- a/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig
+++ b/boards/arm/cc26x2r1_launchxl/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - TI CC26x2R1 LaunchXL board
-#
+# TI CC26x2R1 LaunchXL board
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_CC26X2R1_LAUNCHXL
diff --git a/boards/arm/cc3220sf_launchxl/Kconfig.board b/boards/arm/cc3220sf_launchxl/Kconfig.board
index b256689..0056034 100644
--- a/boards/arm/cc3220sf_launchxl/Kconfig.board
+++ b/boards/arm/cc3220sf_launchxl/Kconfig.board
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink CC3220SF LaunchXL Board
 
-# Kconfig - TI SimpleLink CC3220SF LaunchXL Board
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_CC3220SF_LAUNCHXL
 	bool "TI CC3220SF LAUNCHXL"
diff --git a/boards/arm/cc3220sf_launchxl/Kconfig.defconfig b/boards/arm/cc3220sf_launchxl/Kconfig.defconfig
index 9735ce0..0cd5bcc 100644
--- a/boards/arm/cc3220sf_launchxl/Kconfig.defconfig
+++ b/boards/arm/cc3220sf_launchxl/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI CC3220SF LaunchXL board configuration
 
-# Kconfig - TI CC3220SF LaunchXL board configuration
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if BOARD_CC3220SF_LAUNCHXL
 
diff --git a/boards/arm/cc3235sf_launchxl/Kconfig.board b/boards/arm/cc3235sf_launchxl/Kconfig.board
index 8e5e2a8..470d04b 100644
--- a/boards/arm/cc3235sf_launchxl/Kconfig.board
+++ b/boards/arm/cc3235sf_launchxl/Kconfig.board
@@ -1,9 +1,7 @@
-# Copyright (c) 2019, Texas Instruments Incorporated
-#
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink CC3235SF LaunchXL Board
 
-# Kconfig - TI SimpleLink CC3235SF LaunchXL Board
-#
+# Copyright (c) 2019, Texas Instruments Incorporated
+# SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_CC3235SF_LAUNCHXL
 	bool "TI CC3235SF LAUNCHXL"
diff --git a/boards/arm/cc3235sf_launchxl/Kconfig.defconfig b/boards/arm/cc3235sf_launchxl/Kconfig.defconfig
index 783df11..a4d8e7c 100644
--- a/boards/arm/cc3235sf_launchxl/Kconfig.defconfig
+++ b/boards/arm/cc3235sf_launchxl/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Copyright (c) 2019, Texas Instruments Incorporated
-#
-# SPDX-License-Identifier: Apache-2.0
+# TI CC3235SF LaunchXL board configuration
 
-# Kconfig - TI CC3235SF LaunchXL board configuration
-#
+# Copyright (c) 2019, Texas Instruments Incorporated
+# SPDX-License-Identifier: Apache-2.0
 
 if BOARD_CC3235SF_LAUNCHXL
 
diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.board b/boards/arm/colibri_imx7d_m4/Kconfig.board
index f3a2cc7..016ebca 100644
--- a/boards/arm/colibri_imx7d_m4/Kconfig.board
+++ b/boards/arm/colibri_imx7d_m4/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - Colibri iMX7D M4 board
-#
+# Colibri iMX7D M4 board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_COLIBRI_IMX7D_M4
 	bool "Toradex Colibri iMX7 Dual"
diff --git a/boards/arm/colibri_imx7d_m4/Kconfig.defconfig b/boards/arm/colibri_imx7d_m4/Kconfig.defconfig
index 61cc1e7..47deb69 100644
--- a/boards/arm/colibri_imx7d_m4/Kconfig.defconfig
+++ b/boards/arm/colibri_imx7d_m4/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Colibri iMX7D M4 board
-#
+# Colibri iMX7D M4 board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_COLIBRI_IMX7D_M4
 
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.board b/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.board
index ec85ae1..564868d 100644
--- a/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.board
+++ b/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.board
@@ -1,8 +1,7 @@
-# Kconfig - PSoC6 WiFi-BT Pioneer Kit configuration
-#
+# PSoC6 WiFi-BT Pioneer Kit configuration
+
 # Copyright (c) 2018 Cypress
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_CY8CKIT_062_WIFI_BT_M0
 	bool "PSoC6 WiFi-BT Pioneer Kit M0"
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.defconfig b/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.defconfig
index 28fa06e..e358664 100644
--- a/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.defconfig
+++ b/boards/arm/cy8ckit_062_wifi_bt_m0/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - PSoC6 WiFi-BT Pioneer Kit configuration
-#
+# PSoC6 WiFi-BT Pioneer Kit configuration
+
 # Copyright (c) 2018 Cypress
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_CY8CKIT_062_WIFI_BT_M0
 
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.board b/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.board
index 5c55e85..767624d 100644
--- a/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.board
+++ b/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.board
@@ -1,8 +1,7 @@
-# Kconfig - PSoC6 WiFi-BT Pioneer Kit configuration
-#
+# PSoC6 WiFi-BT Pioneer Kit configuration
+
 # Copyright (c) 2018 Cypress
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_CY8CKIT_062_WIFI_BT_M4
 	bool "PSoC6 WiFi-BT Pioneer Kit M4"
diff --git a/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.defconfig b/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.defconfig
index 6a112e9..f181b6b 100644
--- a/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.defconfig
+++ b/boards/arm/cy8ckit_062_wifi_bt_m4/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - PSoC6 WiFi-BT Pioneer Kit configuration
-#
+# PSoC6 WiFi-BT Pioneer Kit configuration
+
 # Copyright (c) 2018 Cypress
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_CY8CKIT_062_WIFI_BT_M4
 
diff --git a/boards/arm/degu_evk/Kconfig b/boards/arm/degu_evk/Kconfig
index 22938a7..8ceed0c 100644
--- a/boards/arm/degu_evk/Kconfig
+++ b/boards/arm/degu_evk/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Degu Evaluation Kit configuration
-#
+# Degu Evaluation Kit configuration
+
 # Copyright (c) 2019 Atmark Techno, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_DEGU_EVK
diff --git a/boards/arm/degu_evk/Kconfig.board b/boards/arm/degu_evk/Kconfig.board
index 4f4343b..5bfe16a 100644
--- a/boards/arm/degu_evk/Kconfig.board
+++ b/boards/arm/degu_evk/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Degu Evaluation Kit configuration
-#
+# Degu Evaluation Kit configuration
+
 # Copyright (c) 2019 Atmark Techno, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_DEGU_EVK
diff --git a/boards/arm/degu_evk/Kconfig.defconfig b/boards/arm/degu_evk/Kconfig.defconfig
index 6d31e70..4709075 100644
--- a/boards/arm/degu_evk/Kconfig.defconfig
+++ b/boards/arm/degu_evk/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Degu Evaluation Kit configuration
-#
+# Degu Evaluation Kit configuration
+
 # Copyright (c) 2019 Atmark Techno, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_DEGU_EVK
diff --git a/boards/arm/disco_l475_iot1/Kconfig.board b/boards/arm/disco_l475_iot1/Kconfig.board
index 8b57525..98e8d29 100644
--- a/boards/arm/disco_l475_iot1/Kconfig.board
+++ b/boards/arm/disco_l475_iot1/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - Discovery IoT L475 board configuration
-#
+# Discovery IoT L475 board configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_DISCO_L475_IOT1
 	bool "Discovery IoT L475 Development Board"
diff --git a/boards/arm/disco_l475_iot1/Kconfig.defconfig b/boards/arm/disco_l475_iot1/Kconfig.defconfig
index 4ca8179..81addf5 100644
--- a/boards/arm/disco_l475_iot1/Kconfig.defconfig
+++ b/boards/arm/disco_l475_iot1/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Discovery IoT L475 board configuration
-#
+# Discovery IoT L475 board configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_DISCO_L475_IOT1
 
diff --git a/boards/arm/dragino_lsn50/Kconfig.board b/boards/arm/dragino_lsn50/Kconfig.board
index fb0b44a..ba1b127 100644
--- a/boards/arm/dragino_lsn50/Kconfig.board
+++ b/boards/arm/dragino_lsn50/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - Dragino LSN50 LoRA Sensor Node board configuration
-#
+# Dragino LSN50 LoRA Sensor Node board configuration
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_DRAGINO_LSN50
 	bool "Dragino LSN50 Sensor Node"
diff --git a/boards/arm/dragino_lsn50/Kconfig.defconfig b/boards/arm/dragino_lsn50/Kconfig.defconfig
index 57a72b6..92404d3 100644
--- a/boards/arm/dragino_lsn50/Kconfig.defconfig
+++ b/boards/arm/dragino_lsn50/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Dragino LSN50 LoRA Sensor Node board configuration
-#
+# Dragino LSN50 LoRA Sensor Node board configuration
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_DRAGINO_LSN50
 
diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig b/boards/arm/efm32hg_slstk3400a/Kconfig
index 62b6b81..c8d935f 100644
--- a/boards/arm/efm32hg_slstk3400a/Kconfig
+++ b/boards/arm/efm32hg_slstk3400a/Kconfig
@@ -1,8 +1,7 @@
-# Kconfig - EFM32WG SLSTK3400A board configuration
-#
+# EFM32WG SLSTK3400A board configuration
+
 # Copyright (c) 2017 Christian Taedcke
 # Copyright (c) 2018 Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EFM32HG_SLSTK3400A
diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig.board b/boards/arm/efm32hg_slstk3400a/Kconfig.board
index 784fa7c..eb3ca8a 100644
--- a/boards/arm/efm32hg_slstk3400a/Kconfig.board
+++ b/boards/arm/efm32hg_slstk3400a/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - EFM32HG SLSTK3400A board
-#
+# EFM32HG SLSTK3400A board
+
 # Copyright (c) 2018, Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_EFM32HG_SLSTK3400A
 	bool "SiLabs EFM32HG-SLSTK3400A (Happy Gecko)"
diff --git a/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig b/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig
index 2212388..d79c11e 100644
--- a/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig
+++ b/boards/arm/efm32hg_slstk3400a/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - EFM32HG SLSTK3400A board
-#
+# EFM32HG SLSTK3400A board
+
 # Copyright (c) 2018, Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EFM32HG_SLSTK3400A
 
diff --git a/boards/arm/efm32pg_stk3402a/Kconfig b/boards/arm/efm32pg_stk3402a/Kconfig
index 96da66d..71fac34 100644
--- a/boards/arm/efm32pg_stk3402a/Kconfig
+++ b/boards/arm/efm32pg_stk3402a/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - EFM32PG STK3402A board configuration
-#
+# EFM32PG STK3402A board configuration
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EFM32PG_STK3402A
diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.board b/boards/arm/efm32pg_stk3402a/Kconfig.board
index 291dd3f..14030c0 100644
--- a/boards/arm/efm32pg_stk3402a/Kconfig.board
+++ b/boards/arm/efm32pg_stk3402a/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - EFM32PG STK3402A board
-#
+# EFM32PG STK3402A board
+
 # Copyright (c) 2018, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_EFM32PG_STK3402A
 	bool "SiLabs EFM32PG-STK3402A (Pearl Gecko)"
diff --git a/boards/arm/efm32pg_stk3402a/Kconfig.defconfig b/boards/arm/efm32pg_stk3402a/Kconfig.defconfig
index 190313e..d7c65f2 100644
--- a/boards/arm/efm32pg_stk3402a/Kconfig.defconfig
+++ b/boards/arm/efm32pg_stk3402a/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - EFM32PG STK3402A board
-#
+# EFM32PG STK3402A board
+
 # Copyright (c) 2018, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EFM32PG_STK3402A
 
diff --git a/boards/arm/efm32wg_stk3800/Kconfig b/boards/arm/efm32wg_stk3800/Kconfig
index 0c7ed09..873112a 100644
--- a/boards/arm/efm32wg_stk3800/Kconfig
+++ b/boards/arm/efm32wg_stk3800/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - EFM32WG STK3800 board configuration
-#
+# EFM32WG STK3800 board configuration
+
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EFM32WG_STK3800
diff --git a/boards/arm/efm32wg_stk3800/Kconfig.board b/boards/arm/efm32wg_stk3800/Kconfig.board
index 82d8192..d75311c 100644
--- a/boards/arm/efm32wg_stk3800/Kconfig.board
+++ b/boards/arm/efm32wg_stk3800/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - EFM32WG STK3800 board
-#
+# EFM32WG STK3800 board
+
 # Copyright (c) 2017, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_EFM32WG_STK3800
 	bool "SiLabs EFM32WG-STK3800 (Wonder Gecko)"
diff --git a/boards/arm/efm32wg_stk3800/Kconfig.defconfig b/boards/arm/efm32wg_stk3800/Kconfig.defconfig
index 361f34f..669c88a 100644
--- a/boards/arm/efm32wg_stk3800/Kconfig.defconfig
+++ b/boards/arm/efm32wg_stk3800/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - EFM32WG STK3800 board
-#
+# EFM32WG STK3800 board
+
 # Copyright (c) 2017, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EFM32WG_STK3800
 
diff --git a/boards/arm/efr32_slwstk6061a/Kconfig b/boards/arm/efr32_slwstk6061a/Kconfig
index 7872dbc..bb1a456 100644
--- a/boards/arm/efr32_slwstk6061a/Kconfig
+++ b/boards/arm/efr32_slwstk6061a/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - EFR32 SLWSTK6061A board configuration
-#
+# EFR32 SLWSTK6061A board configuration
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EFR32_SLWSTK6061A
diff --git a/boards/arm/efr32_slwstk6061a/Kconfig.board b/boards/arm/efr32_slwstk6061a/Kconfig.board
index 5cfeeec..da79add 100644
--- a/boards/arm/efr32_slwstk6061a/Kconfig.board
+++ b/boards/arm/efr32_slwstk6061a/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - EFR32 SLWSTK6061A board
-#
+# EFR32 SLWSTK6061A board
+
 # Copyright (c) 2018, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_EFR32_SLWSTK6061A
 	bool "SiLabs EFR32-SLWSTK6061A (Flex Gecko)"
diff --git a/boards/arm/efr32_slwstk6061a/Kconfig.defconfig b/boards/arm/efr32_slwstk6061a/Kconfig.defconfig
index 4c1a5e1..1498863 100644
--- a/boards/arm/efr32_slwstk6061a/Kconfig.defconfig
+++ b/boards/arm/efr32_slwstk6061a/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - EFR32 SLWSTK6061A board
-#
+# EFR32 SLWSTK6061A board
+
 # Copyright (c) 2018, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EFR32_SLWSTK6061A
 
diff --git a/boards/arm/efr32mg_sltb004a/Kconfig b/boards/arm/efr32mg_sltb004a/Kconfig
index 7b8ec52..536100e 100644
--- a/boards/arm/efr32mg_sltb004a/Kconfig
+++ b/boards/arm/efr32mg_sltb004a/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - EFR32MG SLTB004A board configuration
-#
+# EFR32MG SLTB004A board configuration
+
 # Copyright (c) 2018 Christian Taedcke, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_EFR32MG_SLTB004A
diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.board b/boards/arm/efr32mg_sltb004a/Kconfig.board
index 4e12e5e..8e884fa 100644
--- a/boards/arm/efr32mg_sltb004a/Kconfig.board
+++ b/boards/arm/efr32mg_sltb004a/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - EFR32MG SLTB004A board
-#
+# EFR32MG SLTB004A board
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_EFR32MG_SLTB004A
 	bool "SiLabs EFR32MG-SLTB004A (Thunderboard Sense 2)"
diff --git a/boards/arm/efr32mg_sltb004a/Kconfig.defconfig b/boards/arm/efr32mg_sltb004a/Kconfig.defconfig
index a053229..700276d 100644
--- a/boards/arm/efr32mg_sltb004a/Kconfig.defconfig
+++ b/boards/arm/efr32mg_sltb004a/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - EFR32MG SLTB004A board
-#
+# EFR32MG SLTB004A board
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_EFR32MG_SLTB004A
 
diff --git a/boards/arm/frdm_k22f/Kconfig.board b/boards/arm/frdm_k22f/Kconfig.board
index 696e751..343dda2 100644
--- a/boards/arm/frdm_k22f/Kconfig.board
+++ b/boards/arm/frdm_k22f/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-K22F board
-#
+# FRDM-K22F board
+
 # Copyright (c) 2018, Prevas A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_FRDM_K22F
 	bool "NXP FRDM-K22F"
diff --git a/boards/arm/frdm_k22f/Kconfig.defconfig b/boards/arm/frdm_k22f/Kconfig.defconfig
index d5c0ae1..7a0d2b8 100644
--- a/boards/arm/frdm_k22f/Kconfig.defconfig
+++ b/boards/arm/frdm_k22f/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-K22F board
-#
+# FRDM-K22F board
+
 # Copyright (c) 2018 Prevas A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_FRDM_K22F
 
diff --git a/boards/arm/frdm_k64f/Kconfig.defconfig b/boards/arm/frdm_k64f/Kconfig.defconfig
index e71a9ea..a4814c0 100644
--- a/boards/arm/frdm_k64f/Kconfig.defconfig
+++ b/boards/arm/frdm_k64f/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-K64F board
-#
+# FRDM-K64F board
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_FRDM_K64F
 
diff --git a/boards/arm/frdm_k82f/Kconfig.board b/boards/arm/frdm_k82f/Kconfig.board
index 94eba6bc..2c18f44 100644
--- a/boards/arm/frdm_k82f/Kconfig.board
+++ b/boards/arm/frdm_k82f/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - FRDM-K82F board configuration
-#
+# FRDM-K82F board configuration
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_FRDM_K82F
diff --git a/boards/arm/frdm_k82f/Kconfig.defconfig b/boards/arm/frdm_k82f/Kconfig.defconfig
index 3bd36bb..994e609 100644
--- a/boards/arm/frdm_k82f/Kconfig.defconfig
+++ b/boards/arm/frdm_k82f/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-K82F board
-#
+# FRDM-K82F board
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_FRDM_K82F
 
diff --git a/boards/arm/frdm_kl25z/Kconfig.board b/boards/arm/frdm_kl25z/Kconfig.board
index 954cf64..9a2a4184 100644
--- a/boards/arm/frdm_kl25z/Kconfig.board
+++ b/boards/arm/frdm_kl25z/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-KL25Z board
-#
+# FRDM-KL25Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_FRDM_KL25Z
 	bool "NXP FRDM-KL25Z"
diff --git a/boards/arm/frdm_kl25z/Kconfig.defconfig b/boards/arm/frdm_kl25z/Kconfig.defconfig
index 2d00f99..4ab6701 100644
--- a/boards/arm/frdm_kl25z/Kconfig.defconfig
+++ b/boards/arm/frdm_kl25z/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-KL25Z board
-#
+# FRDM-KL25Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_FRDM_KL25Z
 
diff --git a/boards/arm/frdm_kw41z/Kconfig.board b/boards/arm/frdm_kw41z/Kconfig.board
index 195a1dc..7d4a584 100644
--- a/boards/arm/frdm_kw41z/Kconfig.board
+++ b/boards/arm/frdm_kw41z/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-KW41Z board
-#
+# FRDM-KW41Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_FRDM_KW41Z
 	bool "NXP FRDM-KW41Z"
diff --git a/boards/arm/frdm_kw41z/Kconfig.defconfig b/boards/arm/frdm_kw41z/Kconfig.defconfig
index b0a3b39..a6f729f 100644
--- a/boards/arm/frdm_kw41z/Kconfig.defconfig
+++ b/boards/arm/frdm_kw41z/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - FRDM-KW41Z board
-#
+# FRDM-KW41Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_FRDM_KW41Z
 
diff --git a/boards/arm/hexiwear_k64/Kconfig b/boards/arm/hexiwear_k64/Kconfig
index b67c741..4a1632c 100644
--- a/boards/arm/hexiwear_k64/Kconfig
+++ b/boards/arm/hexiwear_k64/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Hexiwear K64 board
-#
+# Hexiwear K64 board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_HEXIWEAR_K64
 
diff --git a/boards/arm/hexiwear_k64/Kconfig.board b/boards/arm/hexiwear_k64/Kconfig.board
index 3108b02..664294d 100644
--- a/boards/arm/hexiwear_k64/Kconfig.board
+++ b/boards/arm/hexiwear_k64/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - Hexiwear K64 board
-#
+# Hexiwear K64 board
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_HEXIWEAR_K64
 	bool "NXP Hexiwear K64"
diff --git a/boards/arm/hexiwear_k64/Kconfig.defconfig b/boards/arm/hexiwear_k64/Kconfig.defconfig
index d6497c9..4c4b48a 100644
--- a/boards/arm/hexiwear_k64/Kconfig.defconfig
+++ b/boards/arm/hexiwear_k64/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Hexiwear K64 board
-#
+# Hexiwear K64 board
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_HEXIWEAR_K64
 
diff --git a/boards/arm/hexiwear_kw40z/Kconfig.board b/boards/arm/hexiwear_kw40z/Kconfig.board
index c997b6c..10b0a98 100644
--- a/boards/arm/hexiwear_kw40z/Kconfig.board
+++ b/boards/arm/hexiwear_kw40z/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - Hexiwear KW40Z board
-#
+# Hexiwear KW40Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_HEXIWEAR_KW40Z
 	bool "Hexiwear KW40Z"
diff --git a/boards/arm/hexiwear_kw40z/Kconfig.defconfig b/boards/arm/hexiwear_kw40z/Kconfig.defconfig
index 6882354..114dd89 100644
--- a/boards/arm/hexiwear_kw40z/Kconfig.defconfig
+++ b/boards/arm/hexiwear_kw40z/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Hexiwear KW40Z board
-#
+# Hexiwear KW40Z board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_HEXIWEAR_KW40Z
 
diff --git a/boards/arm/holyiot_yj16019/Kconfig b/boards/arm/holyiot_yj16019/Kconfig
index 4e4f923..c6c54fa 100644
--- a/boards/arm/holyiot_yj16019/Kconfig
+++ b/boards/arm/holyiot_yj16019/Kconfig
@@ -1,5 +1,4 @@
-# Kconfig - Holyiot YJ-16019 board configuration
-#
+# Holyiot YJ-16019 board configuration
+
 # Copyright (c) 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
diff --git a/boards/arm/holyiot_yj16019/Kconfig.board b/boards/arm/holyiot_yj16019/Kconfig.board
index 5e645f3..e49ebf9 100644
--- a/boards/arm/holyiot_yj16019/Kconfig.board
+++ b/boards/arm/holyiot_yj16019/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Holyiot YJ-16019 board configuration
-#
+# Holyiot YJ-16019 board configuration
+
 # Copyright (c) 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_HOLYIOT_YJ16019
diff --git a/boards/arm/holyiot_yj16019/Kconfig.defconfig b/boards/arm/holyiot_yj16019/Kconfig.defconfig
index b9f7677..085abb7 100644
--- a/boards/arm/holyiot_yj16019/Kconfig.defconfig
+++ b/boards/arm/holyiot_yj16019/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Holyiot YJ-16019 board configuration
-#
+# Holyiot YJ-16019 board configuration
+
 # Copyright (c) 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_HOLYIOT_YJ16019
diff --git a/boards/arm/lpcxpresso54114/Kconfig.board b/boards/arm/lpcxpresso54114/Kconfig.board
index 745bcab..ad0e5f5 100644
--- a/boards/arm/lpcxpresso54114/Kconfig.board
+++ b/boards/arm/lpcxpresso54114/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - LPCXpresso54114 board
-#
+# LPCXpresso54114 board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_LPCXPRESSO54114_M4
 	bool "NXP LPCXPRESSO-54114 M4"
diff --git a/boards/arm/lpcxpresso54114/Kconfig.defconfig b/boards/arm/lpcxpresso54114/Kconfig.defconfig
index 4e542fb..7f68e3c 100644
--- a/boards/arm/lpcxpresso54114/Kconfig.defconfig
+++ b/boards/arm/lpcxpresso54114/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - LPCXpresso54114 board
-#
+# LPCXpresso54114 board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_LPCXPRESSO54114_M4 || BOARD_LPCXPRESSO54114_M0
 
diff --git a/boards/arm/lpcxpresso55s69/Kconfig.board b/boards/arm/lpcxpresso55s69/Kconfig.board
index 172c2e0..afdf017 100644
--- a/boards/arm/lpcxpresso55s69/Kconfig.board
+++ b/boards/arm/lpcxpresso55s69/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - LPCXpresso55S69 board
-#
+# LPCXpresso55S69 board
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_LPCXPRESSO55S69_CPU0
 	bool "NXP LPCXPRESSO-55S69 [CPU0]"
diff --git a/boards/arm/lpcxpresso55s69/Kconfig.defconfig b/boards/arm/lpcxpresso55s69/Kconfig.defconfig
index 021e51e..7b51455 100644
--- a/boards/arm/lpcxpresso55s69/Kconfig.defconfig
+++ b/boards/arm/lpcxpresso55s69/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - LPCXpresso55S69 board
-#
+# LPCXpresso55S69 board
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_LPCXPRESSO55S69_CPU0 || BOARD_LPCXPRESSO55S69_CPU1
 
diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.board b/boards/arm/mec1501modular_assy6885/Kconfig.board
index 4f021b4..0e9b720 100644
--- a/boards/arm/mec1501modular_assy6885/Kconfig.board
+++ b/boards/arm/mec1501modular_assy6885/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019, Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MEC1501MODULAR_ASSY6885
 	bool "Microchip MEC1501 Modular ASSY 6885 Development board"
diff --git a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
index 3ad2e59..fb81a3e 100644
--- a/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
+++ b/boards/arm/mec1501modular_assy6885/Kconfig.defconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 if BOARD_MEC1501MODULAR_ASSY6885
 
 config BOARD
diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.board b/boards/arm/mec15xxevb_assy6853/Kconfig.board
index 2342df8..fb7158f 100644
--- a/boards/arm/mec15xxevb_assy6853/Kconfig.board
+++ b/boards/arm/mec15xxevb_assy6853/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019, Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MEC15XXEVB_ASSY6853
 	bool "Microchip MEC15XX EVB ASSY 6853 Development board"
diff --git a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
index 95957f6..5fc7ac3 100644
--- a/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
+++ b/boards/arm/mec15xxevb_assy6853/Kconfig.defconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 if BOARD_MEC15XXEVB_ASSY6853
 
 config BOARD
diff --git a/boards/arm/mec2016evb_assy6797/Kconfig.board b/boards/arm/mec2016evb_assy6797/Kconfig.board
index f0dafcd..0ab279f 100644
--- a/boards/arm/mec2016evb_assy6797/Kconfig.board
+++ b/boards/arm/mec2016evb_assy6797/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019, Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MEC2016EVB_ASSY6797
 	bool "Microchip MEC2016 EVB ASSY 6797 Development board"
diff --git a/boards/arm/mec2016evb_assy6797/Kconfig.defconfig b/boards/arm/mec2016evb_assy6797/Kconfig.defconfig
index f7c8797..c8f73cf 100644
--- a/boards/arm/mec2016evb_assy6797/Kconfig.defconfig
+++ b/boards/arm/mec2016evb_assy6797/Kconfig.defconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 if BOARD_MEC2016EVB_ASSY6797
 
 config BOARD
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board
index a1c2709..5680d9a 100644
--- a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board
+++ b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board
@@ -1,10 +1,8 @@
-# Kconfig - Mikroe MINI-M4 for STM32 board configuration
-#
+# Mikroe MINI-M4 for STM32 board configuration
+
 # Copyright (c) 2019, Kwon Tae-young <tykwon@m2i.co.kr>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_MIKROE_MINI_M4_FOR_STM32
 	bool "Mikroe MINI-M4 for STM32 Board"
 	depends on SOC_STM32F415XX
-
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig
index 4e1ea2f..b993c09 100644
--- a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig
+++ b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Mikroe MINI-M4 for STM32 board configuration
-#
+# Mikroe MINI-M4 for STM32 board configuration
+
 # Copyright (c) 2019, Kwon Tae-young <tykwon@m2i.co.kr>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIKROE_MINI_M4_FOR_STM32
 
diff --git a/boards/arm/mimxrt1015_evk/Kconfig.board b/boards/arm/mimxrt1015_evk/Kconfig.board
index d4890f9..a5dee57 100644
--- a/boards/arm/mimxrt1015_evk/Kconfig.board
+++ b/boards/arm/mimxrt1015_evk/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1015_EVK
 	bool "NXP MIMXRT1015-EVK"
diff --git a/boards/arm/mimxrt1015_evk/Kconfig.defconfig b/boards/arm/mimxrt1015_evk/Kconfig.defconfig
index be7f922..5d34644 100644
--- a/boards/arm/mimxrt1015_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1015_evk/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - MIMXRT1015-EVK board
-#
+# MIMXRT1015-EVK board
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIMXRT1015_EVK
 
diff --git a/boards/arm/mimxrt1020_evk/Kconfig.board b/boards/arm/mimxrt1020_evk/Kconfig.board
index 196d90f..e8ac44e 100644
--- a/boards/arm/mimxrt1020_evk/Kconfig.board
+++ b/boards/arm/mimxrt1020_evk/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1020_EVK
 	bool "NXP MIMXRT1020-EVK"
diff --git a/boards/arm/mimxrt1020_evk/Kconfig.defconfig b/boards/arm/mimxrt1020_evk/Kconfig.defconfig
index daf9ace..05d9a2f 100644
--- a/boards/arm/mimxrt1020_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1020_evk/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - MIMXRT1020-EVK board
-#
+# MIMXRT1020-EVK board
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIMXRT1020_EVK
 
diff --git a/boards/arm/mimxrt1050_evk/Kconfig.board b/boards/arm/mimxrt1050_evk/Kconfig.board
index ebf6702..9627ee2 100644
--- a/boards/arm/mimxrt1050_evk/Kconfig.board
+++ b/boards/arm/mimxrt1050_evk/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1050_EVK
 	bool "NXP MIMXRT1050-EVK"
diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig
index 761e52f..5c44a5a 100644
--- a/boards/arm/mimxrt1050_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1050_evk/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - MIMXRT1050-EVK board
-#
+# MIMXRT1050-EVK board
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIMXRT1050_EVK || BOARD_MIMXRT1050_EVK_QSPI
 
diff --git a/boards/arm/mimxrt1060_evk/Kconfig.board b/boards/arm/mimxrt1060_evk/Kconfig.board
index 0fb856f..6f17d51 100644
--- a/boards/arm/mimxrt1060_evk/Kconfig.board
+++ b/boards/arm/mimxrt1060_evk/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1060_EVK
 	bool "NXP MIMXRT1060-EVK"
diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig
index b3741c4..1cc953d 100644
--- a/boards/arm/mimxrt1060_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1060_evk/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - MIMXRT1060-EVK board
-#
+# MIMXRT1060-EVK board
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH
 
diff --git a/boards/arm/mimxrt1064_evk/Kconfig.board b/boards/arm/mimxrt1064_evk/Kconfig.board
index 8df43cd..0ce09d0 100644
--- a/boards/arm/mimxrt1064_evk/Kconfig.board
+++ b/boards/arm/mimxrt1064_evk/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1064_EVK
 	bool "NXP MIMXRT1064-EVK"
diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig
index 9e03c22..fea38f7 100644
--- a/boards/arm/mimxrt1064_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1064_evk/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - MIMXRT1064-EVK board
-#
+# MIMXRT1064-EVK board
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MIMXRT1064_EVK
 
diff --git a/boards/arm/mps2_an385/Kconfig.board b/boards/arm/mps2_an385/Kconfig.board
index 54e36d7..f2f9be2 100644
--- a/boards/arm/mps2_an385/Kconfig.board
+++ b/boards/arm/mps2_an385/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MPS2_AN385
 	bool "ARM Cortex-M3 SMM on V2M-MPS2 (Application Note AN385)"
diff --git a/boards/arm/mps2_an385/Kconfig.defconfig b/boards/arm/mps2_an385/Kconfig.defconfig
index 79e6168..622bf1e 100644
--- a/boards/arm/mps2_an385/Kconfig.defconfig
+++ b/boards/arm/mps2_an385/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MPS2_AN385
 
diff --git a/boards/arm/mps2_an521/Kconfig.board b/boards/arm/mps2_an521/Kconfig.board
index edb55e1..d68584c 100644
--- a/boards/arm/mps2_an521/Kconfig.board
+++ b/boards/arm/mps2_an521/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018-2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MPS2_AN521
 	bool "ARM Cortex-M33 SMM on V2M-MPS2 (AN521)"
diff --git a/boards/arm/mps2_an521/Kconfig.defconfig b/boards/arm/mps2_an521/Kconfig.defconfig
index ec58be5..71680e7 100644
--- a/boards/arm/mps2_an521/Kconfig.defconfig
+++ b/boards/arm/mps2_an521/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018-2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MPS2_AN521
 
diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig b/boards/arm/msp_exp432p401r_launchxl/Kconfig
index 619a5aa..13d6b2a 100644
--- a/boards/arm/msp_exp432p401r_launchxl/Kconfig
+++ b/boards/arm/msp_exp432p401r_launchxl/Kconfig
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI MSP-EXP432P401R LaunchXL configuration
 
-# Kconfig - TI MSP-EXP432P401R LaunchXL configuration
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if BOARD_MSP_EXP432P401R_LAUNCHXL
 
diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig.board b/boards/arm/msp_exp432p401r_launchxl/Kconfig.board
index 109e7ae..3a15e56 100644
--- a/boards/arm/msp_exp432p401r_launchxl/Kconfig.board
+++ b/boards/arm/msp_exp432p401r_launchxl/Kconfig.board
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink MSP-EXP432P401R LaunchXL Development Board
 
-# Kconfig - TI SimpleLink MSP-EXP432P401R LaunchXL Development Board
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MSP_EXP432P401R_LAUNCHXL
 	bool "TI MSP-EXP432P401R LAUNCHXL"
diff --git a/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig b/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig
index 59c6ce4..e4e6d8b 100644
--- a/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig
+++ b/boards/arm/msp_exp432p401r_launchxl/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI MSP-EXP432P401R LaunchXL development board configuration
 
-# Kconfig - TI MSP-EXP432P401R LaunchXL development board configuration
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if BOARD_MSP_EXP432P401R_LAUNCHXL
 
diff --git a/boards/arm/nrf51_ble400/Kconfig.board b/boards/arm/nrf51_ble400/Kconfig.board
index de0ed6c..18c6f03 100644
--- a/boards/arm/nrf51_ble400/Kconfig.board
+++ b/boards/arm/nrf51_ble400/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BLE400 board configuration
-#
+# nRF51 BLE400 board configuration
+
 # Copyright (c) 2018 Roman Tataurov <diytronic@yandex.ru>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF51_BLE400
diff --git a/boards/arm/nrf51_ble400/Kconfig.defconfig b/boards/arm/nrf51_ble400/Kconfig.defconfig
index c77ad97..5ac005c 100644
--- a/boards/arm/nrf51_ble400/Kconfig.defconfig
+++ b/boards/arm/nrf51_ble400/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BLE400 board configuration
-#
+# nRF51 BLE400 board configuration
+
 # Copyright (c) 2018 Roman Tataurov <diytronic@yandex.ru>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF51_BLE400
diff --git a/boards/arm/nrf51_blenano/Kconfig.board b/boards/arm/nrf51_blenano/Kconfig.board
index 8d1bdaf..a708a1a 100644
--- a/boards/arm/nrf51_blenano/Kconfig.board
+++ b/boards/arm/nrf51_blenano/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BLENANO board configuration
-#
+# nRF51 BLENANO board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF51_BLENANO
diff --git a/boards/arm/nrf51_blenano/Kconfig.defconfig b/boards/arm/nrf51_blenano/Kconfig.defconfig
index f0f31bd..57a6b28 100644
--- a/boards/arm/nrf51_blenano/Kconfig.defconfig
+++ b/boards/arm/nrf51_blenano/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 BLENANO board configuration
-#
+# nRF51 BLENANO board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF51_BLENANO
diff --git a/boards/arm/nrf51_pca10028/Kconfig.board b/boards/arm/nrf51_pca10028/Kconfig.board
index 64fd159..9031aa4 100644
--- a/boards/arm/nrf51_pca10028/Kconfig.board
+++ b/boards/arm/nrf51_pca10028/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 PCA10028 board configuration
-#
+# nRF51 PCA10028 board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF51_PCA10028
diff --git a/boards/arm/nrf51_pca10028/Kconfig.defconfig b/boards/arm/nrf51_pca10028/Kconfig.defconfig
index ff1522b..5eb00c9 100644
--- a/boards/arm/nrf51_pca10028/Kconfig.defconfig
+++ b/boards/arm/nrf51_pca10028/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 PCA10028 board configuration
-#
+# nRF51 PCA10028 board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF51_PCA10028
diff --git a/boards/arm/nrf51_pca10031/Kconfig.board b/boards/arm/nrf51_pca10031/Kconfig.board
index 0662169..4fdbad2 100644
--- a/boards/arm/nrf51_pca10031/Kconfig.board
+++ b/boards/arm/nrf51_pca10031/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 PCA10031 board configuration
-#
+# nRF51 PCA10031 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF51_PCA10031
diff --git a/boards/arm/nrf51_pca10031/Kconfig.defconfig b/boards/arm/nrf51_pca10031/Kconfig.defconfig
index 89933a4..460850e 100644
--- a/boards/arm/nrf51_pca10031/Kconfig.defconfig
+++ b/boards/arm/nrf51_pca10031/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 PCA10031 board configuration
-#
+# nRF51 PCA10031 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF51_PCA10031
diff --git a/boards/arm/nrf51_vbluno51/Kconfig.board b/boards/arm/nrf51_vbluno51/Kconfig.board
index 4f1b30b..d0e6866 100644
--- a/boards/arm/nrf51_vbluno51/Kconfig.board
+++ b/boards/arm/nrf51_vbluno51/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF51-VBLUNO51 board configuration
-#
+# nRF51-VBLUNO51 board configuration
+
 # Copyright (c) 2017 VNG IoT Lab Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF51_VBLUNO51
diff --git a/boards/arm/nrf51_vbluno51/Kconfig.defconfig b/boards/arm/nrf51_vbluno51/Kconfig.defconfig
index f2d833d..b9abd08 100644
--- a/boards/arm/nrf51_vbluno51/Kconfig.defconfig
+++ b/boards/arm/nrf51_vbluno51/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF51 VBLUno51 board configuration
-#
+# nRF51 VBLUno51 board configuration
+
 # Copyright (c) 2017 VNG IoT Lab Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF51_VBLUNO51
diff --git a/boards/arm/nrf52810_pca10040/Kconfig b/boards/arm/nrf52810_pca10040/Kconfig
index 2b2c010..2a55eb5 100644
--- a/boards/arm/nrf52810_pca10040/Kconfig
+++ b/boards/arm/nrf52810_pca10040/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52810 PCA10040 board configuration
-#
+# nRF52810 PCA10040 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52810_PCA10040
diff --git a/boards/arm/nrf52810_pca10040/Kconfig.board b/boards/arm/nrf52810_pca10040/Kconfig.board
index 7160deb..0285147 100644
--- a/boards/arm/nrf52810_pca10040/Kconfig.board
+++ b/boards/arm/nrf52810_pca10040/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF52810 PCA10040 board configuration
-#
+# nRF52810 PCA10040 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52810_PCA10040
diff --git a/boards/arm/nrf52810_pca10040/Kconfig.defconfig b/boards/arm/nrf52810_pca10040/Kconfig.defconfig
index 1244552..2f0f5a6 100644
--- a/boards/arm/nrf52810_pca10040/Kconfig.defconfig
+++ b/boards/arm/nrf52810_pca10040/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52810 PCA10040 board configuration
-#
+# nRF52810 PCA10040 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52810_PCA10040
diff --git a/boards/arm/nrf52811_pca10056/Kconfig b/boards/arm/nrf52811_pca10056/Kconfig
index 129872d..f719db8 100644
--- a/boards/arm/nrf52811_pca10056/Kconfig
+++ b/boards/arm/nrf52811_pca10056/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52811 PCA10056 board configuration
-#
+# nRF52811 PCA10056 board configuration
+
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52811_PCA10056
diff --git a/boards/arm/nrf52811_pca10056/Kconfig.board b/boards/arm/nrf52811_pca10056/Kconfig.board
index 9c36b1b..402d09b 100644
--- a/boards/arm/nrf52811_pca10056/Kconfig.board
+++ b/boards/arm/nrf52811_pca10056/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF52811 PCA10056 board configuration
-#
+# nRF52811 PCA10056 board configuration
+
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52811_PCA10056
diff --git a/boards/arm/nrf52811_pca10056/Kconfig.defconfig b/boards/arm/nrf52811_pca10056/Kconfig.defconfig
index d5eda11..d5165a0 100644
--- a/boards/arm/nrf52811_pca10056/Kconfig.defconfig
+++ b/boards/arm/nrf52811_pca10056/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52811 PCA10056 board configuration
-#
+# nRF52811 PCA10056 board configuration
+
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52811_PCA10056
diff --git a/boards/arm/nrf52832_mdk/Kconfig b/boards/arm/nrf52832_mdk/Kconfig
index 7155ddc..3f5e215 100644
--- a/boards/arm/nrf52832_mdk/Kconfig
+++ b/boards/arm/nrf52832_mdk/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52832-MDK board configuration
-#
+# nRF52832-MDK board configuration
+
 # Copyright (c) 2018 makerdiary.com.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52832_MDK
diff --git a/boards/arm/nrf52832_mdk/Kconfig.board b/boards/arm/nrf52832_mdk/Kconfig.board
index 04aa567..c835f5a 100644
--- a/boards/arm/nrf52832_mdk/Kconfig.board
+++ b/boards/arm/nrf52832_mdk/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF52832-MDK board configuration
-#
+# nRF52832-MDK board configuration
+
 # Copyright (c) 2018 makerdiary.com.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52832_MDK
diff --git a/boards/arm/nrf52832_mdk/Kconfig.defconfig b/boards/arm/nrf52832_mdk/Kconfig.defconfig
index b6c043d..d6b0d13 100644
--- a/boards/arm/nrf52832_mdk/Kconfig.defconfig
+++ b/boards/arm/nrf52832_mdk/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52832-MDK board configuration
-#
+# nRF52832-MDK board configuration
+
 # Copyright (c) 2018 makerdiary.com.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52832_MDK
diff --git a/boards/arm/nrf52840_blip/Kconfig b/boards/arm/nrf52840_blip/Kconfig
index c411836..e1ded20 100644
--- a/boards/arm/nrf52840_blip/Kconfig
+++ b/boards/arm/nrf52840_blip/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Blip board configuration
-#
+# Electronut Labs Blip board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_BLIP
diff --git a/boards/arm/nrf52840_blip/Kconfig.board b/boards/arm/nrf52840_blip/Kconfig.board
index cc340b7..55fe790 100644
--- a/boards/arm/nrf52840_blip/Kconfig.board
+++ b/boards/arm/nrf52840_blip/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Blip board configuration
-#
+# Electronut Labs Blip board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52840_BLIP
diff --git a/boards/arm/nrf52840_blip/Kconfig.defconfig b/boards/arm/nrf52840_blip/Kconfig.defconfig
index 6f354db..6a68f37 100644
--- a/boards/arm/nrf52840_blip/Kconfig.defconfig
+++ b/boards/arm/nrf52840_blip/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Blip board configuration
-#
+# Electronut Labs Blip board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_BLIP
diff --git a/boards/arm/nrf52840_mdk/Kconfig b/boards/arm/nrf52840_mdk/Kconfig
index 1ac8f90..8512f8b 100644
--- a/boards/arm/nrf52840_mdk/Kconfig
+++ b/boards/arm/nrf52840_mdk/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840-MDK board configuration
-#
-# Copyright (c) 2018 makerdiary.com
+# nRF52840-MDK board configuration
 
+# Copyright (c) 2018 makerdiary.com
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_MDK
diff --git a/boards/arm/nrf52840_mdk/Kconfig.board b/boards/arm/nrf52840_mdk/Kconfig.board
index 02caf24..f108fe1 100644
--- a/boards/arm/nrf52840_mdk/Kconfig.board
+++ b/boards/arm/nrf52840_mdk/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840-MDK board configuration
-#
+# nRF52840-MDK board configuration
+
 # Copyright (c) 2018 makerdiary.com
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52840_MDK
diff --git a/boards/arm/nrf52840_mdk/Kconfig.defconfig b/boards/arm/nrf52840_mdk/Kconfig.defconfig
index baed4ab..a6858cc 100644
--- a/boards/arm/nrf52840_mdk/Kconfig.defconfig
+++ b/boards/arm/nrf52840_mdk/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840-MDK board configuration
-#
+# nRF52840-MDK board configuration
+
 # Copyright (c) 2018 makerdiary.com
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_MDK
diff --git a/boards/arm/nrf52840_papyr/Kconfig b/boards/arm/nrf52840_papyr/Kconfig
index bb58192..17f1dc2 100644
--- a/boards/arm/nrf52840_papyr/Kconfig
+++ b/boards/arm/nrf52840_papyr/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Papyr board configuration
-#
+# Electronut Labs Papyr board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PAPYR
diff --git a/boards/arm/nrf52840_papyr/Kconfig.board b/boards/arm/nrf52840_papyr/Kconfig.board
index a7d1a1f..27a4d33 100644
--- a/boards/arm/nrf52840_papyr/Kconfig.board
+++ b/boards/arm/nrf52840_papyr/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Papyr board configuration
-#
+# Electronut Labs Papyr board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52840_PAPYR
diff --git a/boards/arm/nrf52840_papyr/Kconfig.defconfig b/boards/arm/nrf52840_papyr/Kconfig.defconfig
index a2af365..11d5bf6 100644
--- a/boards/arm/nrf52840_papyr/Kconfig.defconfig
+++ b/boards/arm/nrf52840_papyr/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Electronut Labs Papyr board configuration
-#
+# Electronut Labs Papyr board configuration
+
 # Copyright (c) 2018 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PAPYR
diff --git a/boards/arm/nrf52840_pca10056/Kconfig b/boards/arm/nrf52840_pca10056/Kconfig
index 9d2d0cb..270b79b 100644
--- a/boards/arm/nrf52840_pca10056/Kconfig
+++ b/boards/arm/nrf52840_pca10056/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10056 board configuration
-#
+# nRF52840 PCA10056 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10056
diff --git a/boards/arm/nrf52840_pca10056/Kconfig.board b/boards/arm/nrf52840_pca10056/Kconfig.board
index 4504da4..af87e2f 100644
--- a/boards/arm/nrf52840_pca10056/Kconfig.board
+++ b/boards/arm/nrf52840_pca10056/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - nRF52840 PCA10056 board configuration
-#
+# nRF52840 PCA10056 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52840_PCA10056
+config BOARD_NRF52840_PCA10056
 	bool "NRF52840 PCA10056"
 	depends on SOC_NRF52840_QIAA
diff --git a/boards/arm/nrf52840_pca10056/Kconfig.defconfig b/boards/arm/nrf52840_pca10056/Kconfig.defconfig
index 2b1db66..60cc240 100644
--- a/boards/arm/nrf52840_pca10056/Kconfig.defconfig
+++ b/boards/arm/nrf52840_pca10056/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10056 board configuration
-#
+# nRF52840 PCA10056 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10056
diff --git a/boards/arm/nrf52840_pca10059/Kconfig b/boards/arm/nrf52840_pca10059/Kconfig
index 65d0c43..33ab785 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig
+++ b/boards/arm/nrf52840_pca10059/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10059 board configuration
-#
+# nRF52840 PCA10059 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10059
diff --git a/boards/arm/nrf52840_pca10059/Kconfig.board b/boards/arm/nrf52840_pca10059/Kconfig.board
index 9498fe8..0684e68 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig.board
+++ b/boards/arm/nrf52840_pca10059/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - nRF52840 PCA10059 board configuration
-#
+# nRF52840 PCA10059 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52840_PCA10059
+config BOARD_NRF52840_PCA10059
 	bool "NRF52840 PCA10059"
 	depends on SOC_NRF52840_QIAA
diff --git a/boards/arm/nrf52840_pca10059/Kconfig.defconfig b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
index 383cfb9..7bfda08 100644
--- a/boards/arm/nrf52840_pca10059/Kconfig.defconfig
+++ b/boards/arm/nrf52840_pca10059/Kconfig.defconfig
@@ -1,4 +1,4 @@
-# Kconfig - nRF52 PCA10059 board configuration
+# nRF52 PCA10059 board configuration
 #
 # Copyright (c) 2018 Nordic Semiconductor ASA
 #
diff --git a/boards/arm/nrf52840_pca10090/Kconfig b/boards/arm/nrf52840_pca10090/Kconfig
index 00b101f..7fb3a24 100644
--- a/boards/arm/nrf52840_pca10090/Kconfig
+++ b/boards/arm/nrf52840_pca10090/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10090 board configuration
-#
+# nRF52840 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10090
diff --git a/boards/arm/nrf52840_pca10090/Kconfig.board b/boards/arm/nrf52840_pca10090/Kconfig.board
index 52b9c99..14bf02a 100644
--- a/boards/arm/nrf52840_pca10090/Kconfig.board
+++ b/boards/arm/nrf52840_pca10090/Kconfig.board
@@ -1,10 +1,9 @@
-# Kconfig - nRF52840 PCA10090 board configuration
-#
+# nRF52840 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52840_PCA10090
+config BOARD_NRF52840_PCA10090
 	bool "NRF52840 PCA10090"
 	depends on SOC_NRF52840_QIAA
 	# The GPIO driver is required by this board's initialization code
diff --git a/boards/arm/nrf52840_pca10090/Kconfig.defconfig b/boards/arm/nrf52840_pca10090/Kconfig.defconfig
index d371621..8fb9f3b 100644
--- a/boards/arm/nrf52840_pca10090/Kconfig.defconfig
+++ b/boards/arm/nrf52840_pca10090/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10090 board configuration
-#
+# nRF52840 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10090
diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig b/boards/arm/nrf52_adafruit_feather/Kconfig
index 1fba52d..c8c40d8 100644
--- a/boards/arm/nrf52_adafruit_feather/Kconfig
+++ b/boards/arm/nrf52_adafruit_feather/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 Adafruit Feather board configuration
-#
+# nRF52 Adafruit Feather board configuration
+
 # Copyright (c) 2018 LEDCity AG
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_ADAFRUIT_FEATHER
diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig.board b/boards/arm/nrf52_adafruit_feather/Kconfig.board
index 01aa5de..0f629d8 100644
--- a/boards/arm/nrf52_adafruit_feather/Kconfig.board
+++ b/boards/arm/nrf52_adafruit_feather/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - nRF52 ADAFRUIT FEATHER board configuration
-#
-# Copyright (c) 2018 LEDCity AG.
-#
-# SPDX-License-Identifier: Apache-2.0
+# nRF52 ADAFRUIT FEATHER board configuration
 
+# Copyright (c) 2018 LEDCity AG.
+# SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF52_ADAFRUIT_FEATHER
 	bool "nRF52 ADAFRUIT FEATHER"
diff --git a/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig b/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig
index 6f20a87..c75ff94 100644
--- a/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig
+++ b/boards/arm/nrf52_adafruit_feather/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 ADAFRUIT FEATHER board configuration
-#
+# nRF52 ADAFRUIT FEATHER board configuration
+
 # Copyright (c) 2018 LEDCity AG
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_ADAFRUIT_FEATHER
diff --git a/boards/arm/nrf52_blenano2/Kconfig.board b/boards/arm/nrf52_blenano2/Kconfig.board
index 3ea15fe..05fe6ab 100644
--- a/boards/arm/nrf52_blenano2/Kconfig.board
+++ b/boards/arm/nrf52_blenano2/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - nRF52 BLENANO 2 board configuration
-#
-# Copyright (c) 2016 Linaro Limited.
-#
-# SPDX-License-Identifier: Apache-2.0
+# nRF52 BLENANO 2 board configuration
 
+# Copyright (c) 2016 Linaro Limited.
+# SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF52_BLENANO2
 	bool "nRF52 BLENANO2"
diff --git a/boards/arm/nrf52_blenano2/Kconfig.defconfig b/boards/arm/nrf52_blenano2/Kconfig.defconfig
index 4df9c63..7152630 100644
--- a/boards/arm/nrf52_blenano2/Kconfig.defconfig
+++ b/boards/arm/nrf52_blenano2/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 BLENANO 2 board configuration
-#
+# nRF52 BLENANO 2 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_BLENANO2
diff --git a/boards/arm/nrf52_pca10040/Kconfig b/boards/arm/nrf52_pca10040/Kconfig
index 3b7b59a..0a494f5 100644
--- a/boards/arm/nrf52_pca10040/Kconfig
+++ b/boards/arm/nrf52_pca10040/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 PCA10040 board configuration
-#
+# nRF52 PCA10040 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_PCA10040
diff --git a/boards/arm/nrf52_pca10040/Kconfig.board b/boards/arm/nrf52_pca10040/Kconfig.board
index a66de1f..210c656 100644
--- a/boards/arm/nrf52_pca10040/Kconfig.board
+++ b/boards/arm/nrf52_pca10040/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - nRF52 PCA10040 board configuration
-#
+# nRF52 PCA10040 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52_PCA10040
+config BOARD_NRF52_PCA10040
 	bool "nRF52 PCA10040"
 	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_pca10040/Kconfig.defconfig b/boards/arm/nrf52_pca10040/Kconfig.defconfig
index a020c8a..ff1d920 100644
--- a/boards/arm/nrf52_pca10040/Kconfig.defconfig
+++ b/boards/arm/nrf52_pca10040/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 PCA10040 board configuration
-#
+# nRF52 PCA10040 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_PCA10040
diff --git a/boards/arm/nrf52_pca20020/Kconfig b/boards/arm/nrf52_pca20020/Kconfig
index cb67412..58040a2 100644
--- a/boards/arm/nrf52_pca20020/Kconfig
+++ b/boards/arm/nrf52_pca20020/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52_PCA20020 board configuration
-#
+# nRF52_PCA20020 board configuration
+
 # Copyright (c) 2018 Aapo Vienamo
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_PCA20020
diff --git a/boards/arm/nrf52_pca20020/Kconfig.board b/boards/arm/nrf52_pca20020/Kconfig.board
index d838ad3..c542643 100644
--- a/boards/arm/nrf52_pca20020/Kconfig.board
+++ b/boards/arm/nrf52_pca20020/Kconfig.board
@@ -1,10 +1,9 @@
-# Kconfig - nRF52 PCA20020 board configuration
-#
+# nRF52 PCA20020 board configuration
+
 # Copyright (c) 2018 Aapo Vienamo
-#
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52_PCA20020
+config BOARD_NRF52_PCA20020
 	bool "nRF52 PCA20020"
 	select GPIO
 	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_pca20020/Kconfig.defconfig b/boards/arm/nrf52_pca20020/Kconfig.defconfig
index 610f975..9d74192 100644
--- a/boards/arm/nrf52_pca20020/Kconfig.defconfig
+++ b/boards/arm/nrf52_pca20020/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 PCA20020 board configuration
-#
+# nRF52 PCA20020 board configuration
+
 # Copyright (c) 2018 Aapo Vienamo
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_PCA20020
diff --git a/boards/arm/nrf52_sparkfun/Kconfig.board b/boards/arm/nrf52_sparkfun/Kconfig.board
index 131a6e5..3f290f5 100644
--- a/boards/arm/nrf52_sparkfun/Kconfig.board
+++ b/boards/arm/nrf52_sparkfun/Kconfig.board
@@ -1,11 +1,9 @@
-# Kconfig - Sparkfun nRF52832 breakout board configuration
-#
+# Sparkfun nRF52832 breakout board configuration
+
 # Copyright (c) 2017 Shawn Nock <shawn@monadnock.ca>
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
 
-
 config BOARD_NRF52_SPARKFUN
 	bool "nRF52 SPARKFUN"
 	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_sparkfun/Kconfig.defconfig b/boards/arm/nrf52_sparkfun/Kconfig.defconfig
index a6d18e0..7629db8 100644
--- a/boards/arm/nrf52_sparkfun/Kconfig.defconfig
+++ b/boards/arm/nrf52_sparkfun/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Sparkfun nRF52832 breakout  board configuration
-#
+# Sparkfun nRF52832 breakout  board configuration
+
 # Copyright (c) 2017 Shawn Nock <shawn@monadnock.ca>
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_SPARKFUN
diff --git a/boards/arm/nrf52_vbluno52/Kconfig b/boards/arm/nrf52_vbluno52/Kconfig
index 9964cb5..026b4b3 100644
--- a/boards/arm/nrf52_vbluno52/Kconfig
+++ b/boards/arm/nrf52_vbluno52/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 VBLUno52 board configuration
-#
+# nRF52 VBLUno52 board configuration
+
 # Copyright (c) 2017 VNG IoT Lab
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_VBLUNO52
diff --git a/boards/arm/nrf52_vbluno52/Kconfig.board b/boards/arm/nrf52_vbluno52/Kconfig.board
index 86af727..bb1c223 100644
--- a/boards/arm/nrf52_vbluno52/Kconfig.board
+++ b/boards/arm/nrf52_vbluno52/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - nRF52 VBLUno52 board configuration
-#
+# nRF52 VBLUno52 board configuration
 # Copyright (c) 2017 VNG IoT Lab
-#
+
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_NRF52_VBLUNO52
+config BOARD_NRF52_VBLUNO52
 	bool "nRF52 VBLUno52"
 	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_vbluno52/Kconfig.defconfig b/boards/arm/nrf52_vbluno52/Kconfig.defconfig
index 6fb26f4..914b251 100644
--- a/boards/arm/nrf52_vbluno52/Kconfig.defconfig
+++ b/boards/arm/nrf52_vbluno52/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 VBLUno52 board configuration
-#
+# nRF52 VBLUno52 board configuration
+
 # Copyright (c) 2017 VNG IoT Lab
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52_VBLUNO52
diff --git a/boards/arm/nrf9160_pca10090/Kconfig b/boards/arm/nrf9160_pca10090/Kconfig
index 4afec0f..c5f5e92 100644
--- a/boards/arm/nrf9160_pca10090/Kconfig
+++ b/boards/arm/nrf9160_pca10090/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF9160 PCA10090 board configuration
-#
+# nRF9160 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS
diff --git a/boards/arm/nrf9160_pca10090/Kconfig.board b/boards/arm/nrf9160_pca10090/Kconfig.board
index a372041..85713b0 100644
--- a/boards/arm/nrf9160_pca10090/Kconfig.board
+++ b/boards/arm/nrf9160_pca10090/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF9160 PCA10090 board configuration
-#
+# nRF9160 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF9160_SICA
diff --git a/boards/arm/nrf9160_pca10090/Kconfig.defconfig b/boards/arm/nrf9160_pca10090/Kconfig.defconfig
index ad7324b..dff98a2 100644
--- a/boards/arm/nrf9160_pca10090/Kconfig.defconfig
+++ b/boards/arm/nrf9160_pca10090/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF91 PCA10090 board configuration
-#
+# nRF91 PCA10090 board configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF9160_PCA10090 || BOARD_NRF9160_PCA10090NS
diff --git a/boards/arm/nucleo_f030r8/Kconfig.board b/boards/arm/nucleo_f030r8/Kconfig.board
index 45fcf5e..39bd7c7 100644
--- a/boards/arm/nucleo_f030r8/Kconfig.board
+++ b/boards/arm/nucleo_f030r8/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F030R8 MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32F030R8 MCU configuration
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F030R8
 	bool "NUCLEO-64 F030R8 Development Board"
diff --git a/boards/arm/nucleo_f030r8/Kconfig.defconfig b/boards/arm/nucleo_f030r8/Kconfig.defconfig
index e788631..1e9eb94 100644
--- a/boards/arm/nucleo_f030r8/Kconfig.defconfig
+++ b/boards/arm/nucleo_f030r8/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F030R8 MCU
-#
+# STM32 Nucleo-64 development board with STM32F030R8 MCU
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F030R8
 
diff --git a/boards/arm/nucleo_f070rb/Kconfig.board b/boards/arm/nucleo_f070rb/Kconfig.board
index 50218d6..2745ba2 100644
--- a/boards/arm/nucleo_f070rb/Kconfig.board
+++ b/boards/arm/nucleo_f070rb/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO_F070RB board configuration
-#
+# NUCLEO_F070RB board configuration
+
 # Copyright (c) 2018 qianfan Zhao
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F070RB
 	bool "NUCLEO-64 F070RB Development Board"
diff --git a/boards/arm/nucleo_f070rb/Kconfig.defconfig b/boards/arm/nucleo_f070rb/Kconfig.defconfig
index 4c2ab36..9e47a96 100644
--- a/boards/arm/nucleo_f070rb/Kconfig.defconfig
+++ b/boards/arm/nucleo_f070rb/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig -  NUCLEO_F070RB board configuration
-#
+# NUCLEO_F070RB board configuration
+
 # Copyright (c) 2018 qianfan Zhao
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F070RB
 
diff --git a/boards/arm/nucleo_f091rc/Kconfig.board b/boards/arm/nucleo_f091rc/Kconfig.board
index 4a85ff6..d109e7c 100644
--- a/boards/arm/nucleo_f091rc/Kconfig.board
+++ b/boards/arm/nucleo_f091rc/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F091RC MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32F091RC MCU configuration
+
 # Copyright (c) 2017 Bobby Noelte
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F091RC
 	bool "NUCLEO-64 F091RC Development Board"
diff --git a/boards/arm/nucleo_f091rc/Kconfig.defconfig b/boards/arm/nucleo_f091rc/Kconfig.defconfig
index a36026d..85be593 100644
--- a/boards/arm/nucleo_f091rc/Kconfig.defconfig
+++ b/boards/arm/nucleo_f091rc/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F091RC MCU
-#
+# STM32 Nucleo-64 development board with STM32F091RC MCU
+
 # Copyright (c) 2017 Bobby Noelte
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F091RC
 
diff --git a/boards/arm/nucleo_f103rb/Kconfig.board b/boards/arm/nucleo_f103rb/Kconfig.board
index eb69d20..e175a30 100644
--- a/boards/arm/nucleo_f103rb/Kconfig.board
+++ b/boards/arm/nucleo_f103rb/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F103RB board configuration
-#
+# NUCLEO-64 F103RB board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F103RB
 	bool "NUCLEO-64 F103RB Development Board"
diff --git a/boards/arm/nucleo_f103rb/Kconfig.defconfig b/boards/arm/nucleo_f103rb/Kconfig.defconfig
index 15eb80b..280dd61 100644
--- a/boards/arm/nucleo_f103rb/Kconfig.defconfig
+++ b/boards/arm/nucleo_f103rb/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F103RB board configuration
-#
+# NUCLEO-64 F103RB board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F103RB
 
diff --git a/boards/arm/nucleo_f207zg/Kconfig.board b/boards/arm/nucleo_f207zg/Kconfig.board
index 787c5ed..b3054d4 100644
--- a/boards/arm/nucleo_f207zg/Kconfig.board
+++ b/boards/arm/nucleo_f207zg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F207ZG board configuration
-#
+# NUCLEO-144 F207ZG board configuration
+
 # Copyright (c) 2018 qianfan Zhao
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F207ZG
 	bool "NUCLEO-144 F207ZG Development Board"
diff --git a/boards/arm/nucleo_f207zg/Kconfig.defconfig b/boards/arm/nucleo_f207zg/Kconfig.defconfig
index ad4384a..04414b2 100644
--- a/boards/arm/nucleo_f207zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_f207zg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F207ZG board configuration
-#
+# NUCLEO-144 F207ZG board configuration
+
 # Copyright (c) 2018 qianfan Zhao
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F207ZG
 
diff --git a/boards/arm/nucleo_f302r8/Kconfig.board b/boards/arm/nucleo_f302r8/Kconfig.board
index d3f695b..cc238c1 100644
--- a/boards/arm/nucleo_f302r8/Kconfig.board
+++ b/boards/arm/nucleo_f302r8/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F302R8 board configuration
-#
+# NUCLEO-64 F302R8 board configuration
+
 # Copyright (c) 2018 Seitz & Associates
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F302R8
 	bool "NUCLEO-64 F302R8 Development Board"
diff --git a/boards/arm/nucleo_f302r8/Kconfig.defconfig b/boards/arm/nucleo_f302r8/Kconfig.defconfig
index f109945..6592271 100644
--- a/boards/arm/nucleo_f302r8/Kconfig.defconfig
+++ b/boards/arm/nucleo_f302r8/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F302R8 board configuration
-#
+# NUCLEO-64 F302R8 board configuration
+
 # Copyright (c) 2018 Seitz & Associates
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F302R8
 
diff --git a/boards/arm/nucleo_f334r8/Kconfig.board b/boards/arm/nucleo_f334r8/Kconfig.board
index 6c79365..2c2e312 100644
--- a/boards/arm/nucleo_f334r8/Kconfig.board
+++ b/boards/arm/nucleo_f334r8/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F334R8 MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32F334R8 MCU configuration
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F334R8
 	bool "NUCLEO-64 F334R8 Development Board"
diff --git a/boards/arm/nucleo_f334r8/Kconfig.defconfig b/boards/arm/nucleo_f334r8/Kconfig.defconfig
index b1e86f5..291c118 100644
--- a/boards/arm/nucleo_f334r8/Kconfig.defconfig
+++ b/boards/arm/nucleo_f334r8/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32F334R8 MCU
-#
+# STM32 Nucleo-64 development board with STM32F334R8 MCU
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F334R8
 
diff --git a/boards/arm/nucleo_f401re/Kconfig.board b/boards/arm/nucleo_f401re/Kconfig.board
index c8acd38..6ff6e43 100644
--- a/boards/arm/nucleo_f401re/Kconfig.board
+++ b/boards/arm/nucleo_f401re/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F401RE board configuration
-#
+# NUCLEO-64 F401RE board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F401RE
 	bool "NUCLEO-64 F401RE Development Board"
diff --git a/boards/arm/nucleo_f401re/Kconfig.defconfig b/boards/arm/nucleo_f401re/Kconfig.defconfig
index 5f6253e..5936e18 100644
--- a/boards/arm/nucleo_f401re/Kconfig.defconfig
+++ b/boards/arm/nucleo_f401re/Kconfig.defconfig
@@ -1,10 +1,8 @@
-# Kconfig - NUCLEO-64 F401RE board configuration
-#
+# NUCLEO-64 F401RE board configuration
+
 # Copyright (c) 2016 Linaro Limited.
 # Copyright (c) 2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F401RE
 
diff --git a/boards/arm/nucleo_f411re/Kconfig.board b/boards/arm/nucleo_f411re/Kconfig.board
index 3797e46..8d14124 100644
--- a/boards/arm/nucleo_f411re/Kconfig.board
+++ b/boards/arm/nucleo_f411re/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F411RE board configuration
-#
+# NUCLEO-64 F411RE board configuration
+
 # Copyright (c) 2016 Matthias Boesl
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F411RE
 	bool "NUCLEO-64 F411RE Development Board"
diff --git a/boards/arm/nucleo_f411re/Kconfig.defconfig b/boards/arm/nucleo_f411re/Kconfig.defconfig
index 9cf8ac3..512a82e 100644
--- a/boards/arm/nucleo_f411re/Kconfig.defconfig
+++ b/boards/arm/nucleo_f411re/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-64 F411RE board configuration
-#
+# NUCLEO-64 F411RE board configuration
+
 # Copyright (c) 2016 Matthias Boesl
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F411RE
 
diff --git a/boards/arm/nucleo_f412zg/Kconfig.board b/boards/arm/nucleo_f412zg/Kconfig.board
index af12c6a..381cc75 100644
--- a/boards/arm/nucleo_f412zg/Kconfig.board
+++ b/boards/arm/nucleo_f412zg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F412ZG board configuration
-#
+# NUCLEO-144 F412ZG board configuration
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F412ZG
 	bool "NUCLEO-144 F412ZG Development Board"
diff --git a/boards/arm/nucleo_f412zg/Kconfig.defconfig b/boards/arm/nucleo_f412zg/Kconfig.defconfig
index 5782361..19e0796 100644
--- a/boards/arm/nucleo_f412zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_f412zg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F412ZG board configuration
-#
+# NUCLEO-144 F412ZG board configuration
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F412ZG
 
diff --git a/boards/arm/nucleo_f413zh/Kconfig.board b/boards/arm/nucleo_f413zh/Kconfig.board
index 2c46055..ae28485 100644
--- a/boards/arm/nucleo_f413zh/Kconfig.board
+++ b/boards/arm/nucleo_f413zh/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F413ZH board configuration
-#
+# NUCLEO-144 F413ZH board configuration
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F413ZH
 	bool "NUCLEO-144 F413ZH Development Board"
diff --git a/boards/arm/nucleo_f413zh/Kconfig.defconfig b/boards/arm/nucleo_f413zh/Kconfig.defconfig
index 315366a..4b8a2eb 100644
--- a/boards/arm/nucleo_f413zh/Kconfig.defconfig
+++ b/boards/arm/nucleo_f413zh/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F413ZH board configuration
-#
+# NUCLEO-144 F413ZH board configuration
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F413ZH
 
diff --git a/boards/arm/nucleo_f429zi/Kconfig.board b/boards/arm/nucleo_f429zi/Kconfig.board
index 2e537e8..b9e033f 100644
--- a/boards/arm/nucleo_f429zi/Kconfig.board
+++ b/boards/arm/nucleo_f429zi/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F429ZI  board configuration
-#
+# NUCLEO-144 F429ZI  board configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F429ZI
 	bool "NUCLEO-144 F429ZI Development Board"
diff --git a/boards/arm/nucleo_f429zi/Kconfig.defconfig b/boards/arm/nucleo_f429zi/Kconfig.defconfig
index 1b6fc6f..c79484e 100644
--- a/boards/arm/nucleo_f429zi/Kconfig.defconfig
+++ b/boards/arm/nucleo_f429zi/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - NUCLEO-144 F429ZI board configuration
-#
+# NUCLEO-144 F429ZI board configuration
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F429ZI
 
diff --git a/boards/arm/nucleo_f446re/Kconfig.board b/boards/arm/nucleo_f446re/Kconfig.board
index 54a5db0..71f63f7 100644
--- a/boards/arm/nucleo_f446re/Kconfig.board
+++ b/boards/arm/nucleo_f446re/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F446RE Nucleo board configuration
-#
+# STM32F446RE Nucleo board configuration
+
 # Copyright (c) 2018 Philémon Jaermann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F446RE
 	bool "Nucleo F446RE Development Board"
diff --git a/boards/arm/nucleo_f446re/Kconfig.defconfig b/boards/arm/nucleo_f446re/Kconfig.defconfig
index b7354b0..00aface 100644
--- a/boards/arm/nucleo_f446re/Kconfig.defconfig
+++ b/boards/arm/nucleo_f446re/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F446RE Nucleo board configuration
-#
+# STM32F446RE Nucleo board configuration
+
 # Copyright (c) 2018 Philémon Jaermann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F446RE
 
diff --git a/boards/arm/nucleo_f746zg/Kconfig.board b/boards/arm/nucleo_f746zg/Kconfig.board
index e4e0fa4..1b533d6 100644
--- a/boards/arm/nucleo_f746zg/Kconfig.board
+++ b/boards/arm/nucleo_f746zg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F746ZG Nucleo board configuration
-#
+# STM32F746ZG Nucleo board configuration
+
 # Copyright (c) 2018 AJ Palmer
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F746ZG
 	bool "Nucleo F746ZG Development Board"
diff --git a/boards/arm/nucleo_f746zg/Kconfig.defconfig b/boards/arm/nucleo_f746zg/Kconfig.defconfig
index 0368332..c76b08b 100644
--- a/boards/arm/nucleo_f746zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_f746zg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F746ZG Nucleo board configuration
-#
+# STM32F746ZG Nucleo board configuration
+
 # Copyright (c) 2018 AJ Palmer
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F746ZG
 
diff --git a/boards/arm/nucleo_f756zg/Kconfig.board b/boards/arm/nucleo_f756zg/Kconfig.board
index a86b488..46f6113 100644
--- a/boards/arm/nucleo_f756zg/Kconfig.board
+++ b/boards/arm/nucleo_f756zg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F756ZG Nucleo board configuration
-#
+# STM32F756ZG Nucleo board configuration
+
 # Copyright (c) 2018 AJ Palmer
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_F756ZG
 	bool "Nucleo F756ZG Development Board"
diff --git a/boards/arm/nucleo_f756zg/Kconfig.defconfig b/boards/arm/nucleo_f756zg/Kconfig.defconfig
index 4b31607..d7361a4 100644
--- a/boards/arm/nucleo_f756zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_f756zg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F756ZG Nucleo board configuration
-#
+# STM32F756ZG Nucleo board configuration
+
 # Copyright (c) 2018 AJ Palmer
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_F756ZG
 
diff --git a/boards/arm/nucleo_g071rb/Kconfig.board b/boards/arm/nucleo_g071rb/Kconfig.board
index 140c56f..97a74c8 100644
--- a/boards/arm/nucleo_g071rb/Kconfig.board
+++ b/boards/arm/nucleo_g071rb/Kconfig.board
@@ -1,10 +1,8 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32G071RB MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32G071RB MCU configuration
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_G071RB
 	bool "NUCLEO-64 G071RB Development Board"
diff --git a/boards/arm/nucleo_g071rb/Kconfig.defconfig b/boards/arm/nucleo_g071rb/Kconfig.defconfig
index 15b4dac..bc13ac5 100644
--- a/boards/arm/nucleo_g071rb/Kconfig.defconfig
+++ b/boards/arm/nucleo_g071rb/Kconfig.defconfig
@@ -1,10 +1,8 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32G071RB MCU
-#
+# STM32 Nucleo-64 development board with STM32G071RB MCU
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_G071RB
 
diff --git a/boards/arm/nucleo_g431rb/Kconfig.board b/boards/arm/nucleo_g431rb/Kconfig.board
index aa5f1e9..27de2ed 100644
--- a/boards/arm/nucleo_g431rb/Kconfig.board
+++ b/boards/arm/nucleo_g431rb/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32G431RB Nucleo board configuration
-#
+# STM32G431RB Nucleo board configuration
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_G431RB
 	bool "Nucleo G431RB Development Board"
diff --git a/boards/arm/nucleo_g431rb/Kconfig.defconfig b/boards/arm/nucleo_g431rb/Kconfig.defconfig
index 2ed0940..ab38788 100644
--- a/boards/arm/nucleo_g431rb/Kconfig.defconfig
+++ b/boards/arm/nucleo_g431rb/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32G431RB Nucleo board configuration
-#
+# STM32G431RB Nucleo board configuration
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_G431RB
 
diff --git a/boards/arm/nucleo_l053r8/Kconfig.board b/boards/arm/nucleo_l053r8/Kconfig.board
index fa532f8..2500f89 100644
--- a/boards/arm/nucleo_l053r8/Kconfig.board
+++ b/boards/arm/nucleo_l053r8/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32L053R8 MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32L053R8 MCU configuration
+
 # Copyright (c) 2018 Anthony Kreft <anthony.kreft@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L053R8
 	bool "NUCLEO-64 L053R8 Development Board"
diff --git a/boards/arm/nucleo_l053r8/Kconfig.defconfig b/boards/arm/nucleo_l053r8/Kconfig.defconfig
index e68dbfd..0b4ca89 100644
--- a/boards/arm/nucleo_l053r8/Kconfig.defconfig
+++ b/boards/arm/nucleo_l053r8/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32L053R8 MCU
-#
+# STM32 Nucleo-64 development board with STM32L053R8 MCU
+
 # Copyright (c) 2018 Anthony Kreft <anthony.kreft@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L053R8
 
diff --git a/boards/arm/nucleo_l073rz/Kconfig.board b/boards/arm/nucleo_l073rz/Kconfig.board
index f36a58d..4354ccf 100644
--- a/boards/arm/nucleo_l073rz/Kconfig.board
+++ b/boards/arm/nucleo_l073rz/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32L073RZ MCU configuration
-#
+# STM32 Nucleo-64 development board with STM32L073RZ MCU configuration
+
 # Copyright (c) 2018 Ilya Tagunov <tagunil@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L073RZ
 	bool "NUCLEO-64 L073RZ Development Board"
diff --git a/boards/arm/nucleo_l073rz/Kconfig.defconfig b/boards/arm/nucleo_l073rz/Kconfig.defconfig
index 6713277..93fcab7 100644
--- a/boards/arm/nucleo_l073rz/Kconfig.defconfig
+++ b/boards/arm/nucleo_l073rz/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Nucleo-64 development board with STM32L073RZ MCU
-#
+# STM32 Nucleo-64 development board with STM32L073RZ MCU
+
 # Copyright (c) 2018 Ilya Tagunov <tagunil@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L073RZ
 
diff --git a/boards/arm/nucleo_l432kc/Kconfig.board b/boards/arm/nucleo_l432kc/Kconfig.board
index 5d3573d..5340455 100644
--- a/boards/arm/nucleo_l432kc/Kconfig.board
+++ b/boards/arm/nucleo_l432kc/Kconfig.board
@@ -1,10 +1,8 @@
-# Kconfig - STM32L432KC Nucleo board configuration
-#
+# STM32L432KC Nucleo board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L432KC
 	bool "Nucleo L432KC Development Board"
diff --git a/boards/arm/nucleo_l432kc/Kconfig.defconfig b/boards/arm/nucleo_l432kc/Kconfig.defconfig
index 4c344fd..2103b66 100644
--- a/boards/arm/nucleo_l432kc/Kconfig.defconfig
+++ b/boards/arm/nucleo_l432kc/Kconfig.defconfig
@@ -1,10 +1,8 @@
-# Kconfig - STM32L432KC Nucleo board configuration
-#
+# STM32L432KC Nucleo board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L432KC
 
diff --git a/boards/arm/nucleo_l476rg/Kconfig.board b/boards/arm/nucleo_l476rg/Kconfig.board
index 27db7c3..b830255 100644
--- a/boards/arm/nucleo_l476rg/Kconfig.board
+++ b/boards/arm/nucleo_l476rg/Kconfig.board
@@ -1,10 +1,8 @@
-# Kconfig - STM32L476RG Nucleo board configuration
-#
+# STM32L476RG Nucleo board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L476RG
 	bool "Nucleo L476RG Development Board"
diff --git a/boards/arm/nucleo_l476rg/Kconfig.defconfig b/boards/arm/nucleo_l476rg/Kconfig.defconfig
index 5c4c46a..014dcb0 100644
--- a/boards/arm/nucleo_l476rg/Kconfig.defconfig
+++ b/boards/arm/nucleo_l476rg/Kconfig.defconfig
@@ -1,10 +1,8 @@
-# Kconfig - STM32L476RG Nucleo board configuration
-#
+# STM32L476RG Nucleo board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L476RG
 
diff --git a/boards/arm/nucleo_l496zg/Kconfig.board b/boards/arm/nucleo_l496zg/Kconfig.board
index 83ce0e7..908385c 100644
--- a/boards/arm/nucleo_l496zg/Kconfig.board
+++ b/boards/arm/nucleo_l496zg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32L496ZG Nucleo board configuration
-#
+# STM32L496ZG Nucleo board configuration
+
 # Copyright (c) 2018-2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L496ZG
 	bool "Nucleo L496ZG Development Board"
diff --git a/boards/arm/nucleo_l496zg/Kconfig.defconfig b/boards/arm/nucleo_l496zg/Kconfig.defconfig
index 26798dc..73cb2c3 100644
--- a/boards/arm/nucleo_l496zg/Kconfig.defconfig
+++ b/boards/arm/nucleo_l496zg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32L496ZG Nucleo board configuration
-#
+# STM32L496ZG Nucleo board configuration
+
 # Copyright (c) 2018 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L496ZG
 
diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.board b/boards/arm/nucleo_l4r5zi/Kconfig.board
index 439f056..aebd712 100644
--- a/boards/arm/nucleo_l4r5zi/Kconfig.board
+++ b/boards/arm/nucleo_l4r5zi/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32L4R5ZI Nucleo board configuration
-#
+# STM32L4R5ZI Nucleo board configuration
+
 # Copyright (c) 2018 Pushpal Sidhu
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_L4R5ZI
 	bool "Nucleo L4R5ZI Development Board"
diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.defconfig b/boards/arm/nucleo_l4r5zi/Kconfig.defconfig
index 3b3d12e..3ce4da6 100644
--- a/boards/arm/nucleo_l4r5zi/Kconfig.defconfig
+++ b/boards/arm/nucleo_l4r5zi/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32L4R5ZI Nucleo board configuration
-#
+# STM32L4R5ZI Nucleo board configuration
+
 # Copyright (c) 2018 Pushpal Sidhu
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_L4R5ZI
 
diff --git a/boards/arm/nucleo_wb55rg/Kconfig.board b/boards/arm/nucleo_wb55rg/Kconfig.board
index 6e06d94..a81009c 100644
--- a/boards/arm/nucleo_wb55rg/Kconfig.board
+++ b/boards/arm/nucleo_wb55rg/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32WB55RG Nucleo board configuration
-#
+# STM32WB55RG Nucleo board configuration
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_NUCLEO_WB55RG
 	bool "Nucleo WB55RG Development Board"
diff --git a/boards/arm/nucleo_wb55rg/Kconfig.defconfig b/boards/arm/nucleo_wb55rg/Kconfig.defconfig
index 2e94b93..1fc1267 100644
--- a/boards/arm/nucleo_wb55rg/Kconfig.defconfig
+++ b/boards/arm/nucleo_wb55rg/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32LWB55RG Nucleo board configuration
-#
+# STM32LWB55RG Nucleo board configuration
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_NUCLEO_WB55RG
 
diff --git a/boards/arm/olimex_stm32_e407/Kconfig.board b/boards/arm/olimex_stm32_e407/Kconfig.board
index 4a85ebc..ff09270 100644
--- a/boards/arm/olimex_stm32_e407/Kconfig.board
+++ b/boards/arm/olimex_stm32_e407/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - OLIMEX-STM32-E407 board configuration
-#
+# OLIMEX-STM32-E407 board configuration
+
 # Copyright (c) 2017, Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_OLIMEX_STM32_E407
 	bool "OLIMEX-STM32-E407 Development Board"
 	depends on SOC_STM32F407XG
diff --git a/boards/arm/olimex_stm32_e407/Kconfig.defconfig b/boards/arm/olimex_stm32_e407/Kconfig.defconfig
index d093824..efb8ca8 100644
--- a/boards/arm/olimex_stm32_e407/Kconfig.defconfig
+++ b/boards/arm/olimex_stm32_e407/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - OLIMEX-STM32-E407 board configuration
-#
+# OLIMEX-STM32-E407 board configuration
+
 # Copyright (c) 2017, Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_OLIMEX_STM32_E407
 
diff --git a/boards/arm/olimex_stm32_h407/Kconfig.board b/boards/arm/olimex_stm32_h407/Kconfig.board
index acb97dd..c08552c 100644
--- a/boards/arm/olimex_stm32_h407/Kconfig.board
+++ b/boards/arm/olimex_stm32_h407/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - OLIMEX-STM32-H407 board configuration
-#
+# OLIMEX-STM32-H407 board configuration
+
 # Copyright (c) 2018, Reto Schneider <code@reto-schneider.ch>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_OLIMEX_STM32_H407
 	bool "OLIMEX-STM32-H407 Development Board"
 	depends on SOC_STM32F407XG
diff --git a/boards/arm/olimex_stm32_h407/Kconfig.defconfig b/boards/arm/olimex_stm32_h407/Kconfig.defconfig
index 88d94aa..3001cda 100644
--- a/boards/arm/olimex_stm32_h407/Kconfig.defconfig
+++ b/boards/arm/olimex_stm32_h407/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - OLIMEX-STM32-H407 board configuration
-#
+# OLIMEX-STM32-H407 board configuration
+
 # Copyright (c) 2018, Reto Schneider <code@reto-schneider.ch>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_OLIMEX_STM32_H407
 
diff --git a/boards/arm/olimex_stm32_p405/Kconfig.board b/boards/arm/olimex_stm32_p405/Kconfig.board
index bcaeebc..fdc3330 100644
--- a/boards/arm/olimex_stm32_p405/Kconfig.board
+++ b/boards/arm/olimex_stm32_p405/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - OLIMEX-STM32-P405 board configuration
-#
+# OLIMEX-STM32-P405 board configuration
+
 # Copyright (c) 2017, Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_OLIMEX_STM32_P405
 	bool "OLIMEX-STM32-P405 Development Board"
 	depends on SOC_STM32F405XG
diff --git a/boards/arm/olimex_stm32_p405/Kconfig.defconfig b/boards/arm/olimex_stm32_p405/Kconfig.defconfig
index 3f7d757..85f75e8 100644
--- a/boards/arm/olimex_stm32_p405/Kconfig.defconfig
+++ b/boards/arm/olimex_stm32_p405/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - OLIMEX-STM32-P405 board configuration
-#
+# OLIMEX-STM32-P405 board configuration
+
 # Copyright (c) 2017, Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_OLIMEX_STM32_P405
 
diff --git a/boards/arm/olimexino_stm32/Kconfig.board b/boards/arm/olimexino_stm32/Kconfig.board
index f84125e..c26c441 100644
--- a/boards/arm/olimexino_stm32/Kconfig.board
+++ b/boards/arm/olimexino_stm32/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - OLIMEXINO-STM32 board configuration
-#
+# OLIMEXINO-STM32 board configuration
+
 # Copyright (c) 2016, I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_OLIMEXINO_STM32
 	bool "OLIMEXINO-STM32 Development Board"
 	depends on SOC_STM32F103XB
diff --git a/boards/arm/olimexino_stm32/Kconfig.defconfig b/boards/arm/olimexino_stm32/Kconfig.defconfig
index c3a3744..a117a5a 100644
--- a/boards/arm/olimexino_stm32/Kconfig.defconfig
+++ b/boards/arm/olimexino_stm32/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - OLIMEXINO-STM32 board configuration
-#
+# OLIMEXINO-STM32 board configuration
+
 # Copyright (c) 2016, I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_OLIMEXINO_STM32
 
diff --git a/boards/arm/particle_argon/Kconfig b/boards/arm/particle_argon/Kconfig
index 6bf74ac..eb969c2 100644
--- a/boards/arm/particle_argon/Kconfig
+++ b/boards/arm/particle_argon/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Particle Argon configuration
-#
+# Particle Argon configuration
+
 # Copyright (c) 2018 Matthias Boesl
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_ARGON
diff --git a/boards/arm/particle_argon/Kconfig.board b/boards/arm/particle_argon/Kconfig.board
index 59f0c52..e46321d 100644
--- a/boards/arm/particle_argon/Kconfig.board
+++ b/boards/arm/particle_argon/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Particle Argon configuration
-#
+# Particle Argon configuration
+
 # Copyright (c) 2018 Matthias Boesl
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_PARTICLE_ARGON
diff --git a/boards/arm/particle_argon/Kconfig.defconfig b/boards/arm/particle_argon/Kconfig.defconfig
index 7597591..108e20e 100644
--- a/boards/arm/particle_argon/Kconfig.defconfig
+++ b/boards/arm/particle_argon/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Particle Argon board configuration
-#
+# Particle Argon board configuration
+
 # Copyright (c) 2018 Matthias Boesl
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_ARGON
diff --git a/boards/arm/particle_boron/Kconfig b/boards/arm/particle_boron/Kconfig
index 9fd90b7..6b54788 100644
--- a/boards/arm/particle_boron/Kconfig
+++ b/boards/arm/particle_boron/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Particle Boron configuration
-#
+# Particle Boron configuration
+
 # Copyright (c) 2018 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_BORON
diff --git a/boards/arm/particle_boron/Kconfig.board b/boards/arm/particle_boron/Kconfig.board
index 572730f..2c47491 100644
--- a/boards/arm/particle_boron/Kconfig.board
+++ b/boards/arm/particle_boron/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Particle Boron configuration
-#
+# Particle Boron configuration
+
 # Copyright (c) 2018 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_PARTICLE_BORON
diff --git a/boards/arm/particle_boron/Kconfig.defconfig b/boards/arm/particle_boron/Kconfig.defconfig
index 9e9390f..ace002d 100644
--- a/boards/arm/particle_boron/Kconfig.defconfig
+++ b/boards/arm/particle_boron/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - Particle Boron board configuration
-#
+# Particle Boron board configuration
+
 # Copyright (c) 2018 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_BORON
diff --git a/boards/arm/particle_xenon/Kconfig b/boards/arm/particle_xenon/Kconfig
index 8963fb8..922162f 100644
--- a/boards/arm/particle_xenon/Kconfig
+++ b/boards/arm/particle_xenon/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Particle Xenon configuration
-#
+# Particle Xenon configuration
+
 # Copyright (c) 2018 Endre Karlson
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_XENON
diff --git a/boards/arm/particle_xenon/Kconfig.board b/boards/arm/particle_xenon/Kconfig.board
index 70e34ee..5dc682c 100644
--- a/boards/arm/particle_xenon/Kconfig.board
+++ b/boards/arm/particle_xenon/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - Particle Xenon configuration
-#
+# Particle Xenon configuration
+
 # Copyright (c) 2018 Endre Karlson
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_PARTICLE_XENON
diff --git a/boards/arm/particle_xenon/Kconfig.defconfig b/boards/arm/particle_xenon/Kconfig.defconfig
index d7231f1..7f1cff1 100644
--- a/boards/arm/particle_xenon/Kconfig.defconfig
+++ b/boards/arm/particle_xenon/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Particle Xenon board configuration
-#
+# Particle Xenon board configuration
+
 # Copyright (c) 2018 Endre Karlson
 # Copyright (c) 2018 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_PARTICLE_XENON
diff --git a/boards/arm/pico_pi_m4/Kconfig.board b/boards/arm/pico_pi_m4/Kconfig.board
index 525dbca..e980c3d 100644
--- a/boards/arm/pico_pi_m4/Kconfig.board
+++ b/boards/arm/pico_pi_m4/Kconfig.board
@@ -1,9 +1,8 @@
-# Kconfig - Pico-Pi iMX7D M4 board
-#
+# Pico-Pi iMX7D M4 board
+
 # Copyright (c) 2019, Joris Offouga
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config BOARD_PICO_PI_M4
 	bool "Pico-PI iMX7D Dual"
 	depends on SOC_SERIES_IMX7_M4
diff --git a/boards/arm/pico_pi_m4/Kconfig.defconfig b/boards/arm/pico_pi_m4/Kconfig.defconfig
index 6e45424..b098e66 100644
--- a/boards/arm/pico_pi_m4/Kconfig.defconfig
+++ b/boards/arm/pico_pi_m4/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - Pico-Pi iMX7D M4 board
-#
+# Pico-Pi iMX7D M4 board
+
 # Copyright (c) 2019, Joris Offouga
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_PICO_PI_M4
 
diff --git a/boards/arm/qemu_cortex_m0/Kconfig.board b/boards/arm/qemu_cortex_m0/Kconfig.board
index 7c4f964..8a6473d 100644
--- a/boards/arm/qemu_cortex_m0/Kconfig.board
+++ b/boards/arm/qemu_cortex_m0/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - QEMU Cortex-M0 board configuration
-#
+# QEMU Cortex-M0 board configuration
+
 # Copyright (c) 2019 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_QEMU_CORTEX_M0
diff --git a/boards/arm/qemu_cortex_m0/Kconfig.defconfig b/boards/arm/qemu_cortex_m0/Kconfig.defconfig
index 6a4a724..42cc0e2 100644
--- a/boards/arm/qemu_cortex_m0/Kconfig.defconfig
+++ b/boards/arm/qemu_cortex_m0/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - QEMU Cortex-M0 board configuration
-#
+# QEMU Cortex-M0 board configuration
+
 # Copyright (c) 2019 Nordic Semiconductor ASA.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_QEMU_CORTEX_M0
diff --git a/boards/arm/qemu_cortex_r5/Kconfig.board b/boards/arm/qemu_cortex_r5/Kconfig.board
index 9e8fb7f..0dae3d1 100644
--- a/boards/arm/qemu_cortex_r5/Kconfig.board
+++ b/boards/arm/qemu_cortex_r5/Kconfig.board
@@ -1,5 +1,4 @@
 # Copyright (c) 2019 Lexmark International, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_QEMU_CORTEX_R5
diff --git a/boards/arm/qemu_cortex_r5/Kconfig.defconfig b/boards/arm/qemu_cortex_r5/Kconfig.defconfig
index c3aa118..3071e8d 100644
--- a/boards/arm/qemu_cortex_r5/Kconfig.defconfig
+++ b/boards/arm/qemu_cortex_r5/Kconfig.defconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2019 Lexmark International, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_QEMU_CORTEX_R5
diff --git a/boards/arm/reel_board/Kconfig b/boards/arm/reel_board/Kconfig
index c7ce955..9c8aef4 100644
--- a/boards/arm/reel_board/Kconfig
+++ b/boards/arm/reel_board/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - reel board configuration
-#
+# reel board configuration
+
 # Copyright (c) 2018-2019 PHYTEC Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_REEL_BOARD || BOARD_REEL_BOARD_V2
diff --git a/boards/arm/reel_board/Kconfig.board b/boards/arm/reel_board/Kconfig.board
index 99ba391..297bb42 100644
--- a/boards/arm/reel_board/Kconfig.board
+++ b/boards/arm/reel_board/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - reel board configuration
-#
+# reel board configuration
+
 # Copyright (c) 2018-2019 PHYTEC Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_REEL_BOARD
diff --git a/boards/arm/reel_board/Kconfig.defconfig b/boards/arm/reel_board/Kconfig.defconfig
index 695c7d7..0d92c9b 100644
--- a/boards/arm/reel_board/Kconfig.defconfig
+++ b/boards/arm/reel_board/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - reel board configuration
-#
+# reel board configuration
+
 # Copyright (c) 2018-2019 PHYTEC Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_REEL_BOARD || BOARD_REEL_BOARD_V2
diff --git a/boards/arm/sam4s_xplained/Kconfig.board b/boards/arm/sam4s_xplained/Kconfig.board
index 128e7b9..65ec186 100644
--- a/boards/arm/sam4s_xplained/Kconfig.board
+++ b/boards/arm/sam4s_xplained/Kconfig.board
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM4S Xplained Board selection
-#
+# Atmel SAM4S Xplained Board selection
+
 # Copyright (c) 2017 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_SAM4S_XPLAINED
 	bool "Atmel SAM4S Xplained"
diff --git a/boards/arm/sam4s_xplained/Kconfig.defconfig b/boards/arm/sam4s_xplained/Kconfig.defconfig
index 00a6f63..8eaaeaa 100644
--- a/boards/arm/sam4s_xplained/Kconfig.defconfig
+++ b/boards/arm/sam4s_xplained/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM4S Xplained Board configuration
-#
+# Atmel SAM4S Xplained Board configuration
+
 # Copyright (c) 2017 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_SAM4S_XPLAINED
 
diff --git a/boards/arm/sam_e70_xplained/Kconfig.board b/boards/arm/sam_e70_xplained/Kconfig.board
index e3a0b17..f7ff0b7 100644
--- a/boards/arm/sam_e70_xplained/Kconfig.board
+++ b/boards/arm/sam_e70_xplained/Kconfig.board
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SMART SAM E70 Xplained Board selection
-#
+# Atmel SMART SAM E70 Xplained Board selection
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_SAM_E70_XPLAINED
 	bool "Atmel SMART SAM E70 Xplained Board"
diff --git a/boards/arm/sam_e70_xplained/Kconfig.defconfig b/boards/arm/sam_e70_xplained/Kconfig.defconfig
index 53ac3a7..b5f7f33 100644
--- a/boards/arm/sam_e70_xplained/Kconfig.defconfig
+++ b/boards/arm/sam_e70_xplained/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SMART SAM E70 Xplained Board configuration
-#
+# Atmel SMART SAM E70 Xplained Board configuration
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_SAM_E70_XPLAINED
 
diff --git a/boards/arm/sensortile_box/Kconfig.board b/boards/arm/sensortile_box/Kconfig.board
index 433c1f1..5341a09 100644
--- a/boards/arm/sensortile_box/Kconfig.board
+++ b/boards/arm/sensortile_box/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - SensorTile.box board configuration
-#
+# SensorTile.box board configuration
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_SENSORTILE_BOX
 	bool "SensorTile.box Development Board"
diff --git a/boards/arm/sensortile_box/Kconfig.defconfig b/boards/arm/sensortile_box/Kconfig.defconfig
index e224e3c..a3534b4 100644
--- a/boards/arm/sensortile_box/Kconfig.defconfig
+++ b/boards/arm/sensortile_box/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - SensorTile.box board configuration
-#
+# SensorTile.box board configuration
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_SENSORTILE_BOX
 
diff --git a/boards/arm/steval_fcu001v1/Kconfig.board b/boards/arm/steval_fcu001v1/Kconfig.board
index 9ed03f0..228bf67 100644
--- a/boards/arm/steval_fcu001v1/Kconfig.board
+++ b/boards/arm/steval_fcu001v1/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Flight Controller Unit board configuration
-#
+# STM32 Flight Controller Unit board configuration
+
 # Copyright (c) 2019 Linumiz
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STEVAL_FCU001V1
 	bool "STM32 Flight Controller Unit"
diff --git a/boards/arm/steval_fcu001v1/Kconfig.defconfig b/boards/arm/steval_fcu001v1/Kconfig.defconfig
index acbd99e..68705cd 100644
--- a/boards/arm/steval_fcu001v1/Kconfig.defconfig
+++ b/boards/arm/steval_fcu001v1/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - STM32 Flight Controller Unit board configuration
-#
-# Copyright (c) 2019 Linumiz
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# STM32 Flight Controller Unit board configuration
 
+# Copyright (c) 2019 Linumiz
+# SPDX-License-Identifier: Apache-2.0
 
 if BOARD_STEVAL_FCU001V1
 
diff --git a/boards/arm/stm3210c_eval/Kconfig.board b/boards/arm/stm3210c_eval/Kconfig.board
index f967e72..8e55fc2 100644
--- a/boards/arm/stm3210c_eval/Kconfig.board
+++ b/boards/arm/stm3210c_eval/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM3210C-EVAL board configuration
-#
+# STM3210C-EVAL board configuration
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM3210C_EVAL
 	bool "STM3210C-EVAL Evaluation Board"
diff --git a/boards/arm/stm3210c_eval/Kconfig.defconfig b/boards/arm/stm3210c_eval/Kconfig.defconfig
index 9853237..6a5a8b5 100644
--- a/boards/arm/stm3210c_eval/Kconfig.defconfig
+++ b/boards/arm/stm3210c_eval/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM3210C-EVAL board configuration
-#
+# STM3210C-EVAL board configuration
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM3210C_EVAL
 
diff --git a/boards/arm/stm32373c_eval/Kconfig.board b/boards/arm/stm32373c_eval/Kconfig.board
index 7f42794..5348461 100644
--- a/boards/arm/stm32373c_eval/Kconfig.board
+++ b/boards/arm/stm32373c_eval/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32373C-EVAL evaluation board configuration
-#
+# STM32373C-EVAL evaluation board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32373C_EVAL
 	bool "STM32373C_EVAL Evaluation Board"
diff --git a/boards/arm/stm32373c_eval/Kconfig.defconfig b/boards/arm/stm32373c_eval/Kconfig.defconfig
index c942179..1d16597 100644
--- a/boards/arm/stm32373c_eval/Kconfig.defconfig
+++ b/boards/arm/stm32373c_eval/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32373C-EVAL evaluation board configuration
-#
+# STM32373C-EVAL evaluation board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32373C_EVAL
 
diff --git a/boards/arm/stm32_min_dev/Kconfig.board b/boards/arm/stm32_min_dev/Kconfig.board
index 9e825d6..3b64871 100644
--- a/boards/arm/stm32_min_dev/Kconfig.board
+++ b/boards/arm/stm32_min_dev/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Minimum Development Board Configuration
-#
+# STM32 Minimum Development Board Configuration
+
 # Copyright (c) 2017, embedjournal.com
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32_MIN_DEV_BLUE
 	bool "STM32 Minimum Development Board (Blue)"
diff --git a/boards/arm/stm32_min_dev/Kconfig.defconfig b/boards/arm/stm32_min_dev/Kconfig.defconfig
index 5b6b319..723418e 100644
--- a/boards/arm/stm32_min_dev/Kconfig.defconfig
+++ b/boards/arm/stm32_min_dev/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Minimum Development Board Configuration
-#
+# STM32 Minimum Development Board Configuration
+
 # Copyright (c) 2017, embedjournal.com
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32_MIN_DEV_BLUE || BOARD_STM32_MIN_DEV_BLACK
 
diff --git a/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig b/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig
index 07b56b7..1966273 100644
--- a/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig
+++ b/boards/arm/stm32_min_dev/stm32_min_dev_black_defconfig
@@ -1,4 +1,4 @@
-# Kconfig - STM32 Minimum Development Board Configuration
+# STM32 Minimum Development Board Configuration
 #
 # Copyright (c) 2019, embedjournal.com
 #
diff --git a/boards/arm/stm32f030_demo/Kconfig.board b/boards/arm/stm32f030_demo/Kconfig.board
index bc6b46d..3a34ac7 100644
--- a/boards/arm/stm32f030_demo/Kconfig.board
+++ b/boards/arm/stm32f030_demo/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Antony Pavlov <antonynpavlov@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F030_DEMO
 	bool "STM32F030 DEMO Board"
diff --git a/boards/arm/stm32f030_demo/Kconfig.defconfig b/boards/arm/stm32f030_demo/Kconfig.defconfig
index 7ad218e..4bb63af 100644
--- a/boards/arm/stm32f030_demo/Kconfig.defconfig
+++ b/boards/arm/stm32f030_demo/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Antony Pavlov <antonynpavlov@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F030_DEMO
 
diff --git a/boards/arm/stm32f072_eval/Kconfig.board b/boards/arm/stm32f072_eval/Kconfig.board
index 15406c9..9db08b5 100644
--- a/boards/arm/stm32f072_eval/Kconfig.board
+++ b/boards/arm/stm32f072_eval/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F072-EVAL board configuration
-#
+# STM32F072-EVAL board configuration
+
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F072_EVAL
 	bool "STM32F072-EVAL Development Board"
diff --git a/boards/arm/stm32f072_eval/Kconfig.defconfig b/boards/arm/stm32f072_eval/Kconfig.defconfig
index 4d69147..7c92aa4 100644
--- a/boards/arm/stm32f072_eval/Kconfig.defconfig
+++ b/boards/arm/stm32f072_eval/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F072-EVAL board configuration
-#
+# STM32F072-EVAL board configuration
+
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F072_EVAL
 
diff --git a/boards/arm/stm32f072b_disco/Kconfig.board b/boards/arm/stm32f072b_disco/Kconfig.board
index b3e6226..26be5a3 100644
--- a/boards/arm/stm32f072b_disco/Kconfig.board
+++ b/boards/arm/stm32f072b_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F072B-DISCO board configuration
-#
+# STM32F072B-DISCO board configuration
+
 # Copyright (c) 2017 Clage GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F072B_DISCO
 	bool "STM32F072B-DISCO Development Board"
diff --git a/boards/arm/stm32f072b_disco/Kconfig.defconfig b/boards/arm/stm32f072b_disco/Kconfig.defconfig
index 087adc5..1a04e03 100644
--- a/boards/arm/stm32f072b_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f072b_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig -  STM32F072B-DISCO board configuration
-#
+# STM32F072B-DISCO board configuration
+
 # Copyright (c) 2017 Clage GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F072B_DISCO
 
diff --git a/boards/arm/stm32f0_disco/Kconfig.board b/boards/arm/stm32f0_disco/Kconfig.board
index 3a10672..82e26ac 100644
--- a/boards/arm/stm32f0_disco/Kconfig.board
+++ b/boards/arm/stm32f0_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F0DISCOVERY development board with STM32F051R8 MCU configuration
-#
+# STM32F0DISCOVERY development board with STM32F051R8 MCU configuration
+
 # Copyright (c) 2018 Nathan Tsoi <nathan@vertile.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F0_DISCO
 	bool "STM32F0DISCOVERY Development Board"
diff --git a/boards/arm/stm32f0_disco/Kconfig.defconfig b/boards/arm/stm32f0_disco/Kconfig.defconfig
index aeca9be..e9d2c7d 100644
--- a/boards/arm/stm32f0_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f0_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F0 development board with STM32F051R8T6 MCU
-#
+# STM32F0 development board with STM32F051R8T6 MCU
+
 # Copyright (c) 2018 Nathan Tsoi <nathan@vertile.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F0_DISCO
 
diff --git a/boards/arm/stm32f3_disco/Kconfig.board b/boards/arm/stm32f3_disco/Kconfig.board
index 937beba..280b48f 100644
--- a/boards/arm/stm32f3_disco/Kconfig.board
+++ b/boards/arm/stm32f3_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F3DISCOVERY board configuration
-#
+# STM32F3DISCOVERY board configuration
+
 # Copyright (c) 2017 I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F3_DISCO
 	bool "STM32F3DISCOVERY Development Board"
diff --git a/boards/arm/stm32f3_disco/Kconfig.defconfig b/boards/arm/stm32f3_disco/Kconfig.defconfig
index ec999ff..e6dbccb 100644
--- a/boards/arm/stm32f3_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f3_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F3DISCOVERY board configuration
-#
+# STM32F3DISCOVERY board configuration
+
 # Copyright (c) 2017 I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F3_DISCO
 
diff --git a/boards/arm/stm32f411e_disco/Kconfig.board b/boards/arm/stm32f411e_disco/Kconfig.board
index 82deddc..20906de 100644
--- a/boards/arm/stm32f411e_disco/Kconfig.board
+++ b/boards/arm/stm32f411e_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F411E-DISCO board configuration
-#
+# STM32F411E-DISCO board configuration
+
 # Copyright (c) 2017 Fenix Engineering Solutions
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F411E_DISCO
 	bool "STM32F411E-DISCO Development Board"
diff --git a/boards/arm/stm32f411e_disco/Kconfig.defconfig b/boards/arm/stm32f411e_disco/Kconfig.defconfig
index bfd21ef..8d269fb 100644
--- a/boards/arm/stm32f411e_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f411e_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F411E-DISCO board configuration
-#
+# STM32F411E-DISCO board configuration
+
 # Copyright (c) 2017 Fenix Engineering Solutions
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F411E_DISCO
 
diff --git a/boards/arm/stm32f412g_disco/Kconfig.board b/boards/arm/stm32f412g_disco/Kconfig.board
index 718a4ef..c70202c 100644
--- a/boards/arm/stm32f412g_disco/Kconfig.board
+++ b/boards/arm/stm32f412g_disco/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - STM32F412G-DISCO board configuration
-#
+# STM32F412G-DISCO board configuration
+
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F412G_DISCO
 	bool "STM32F412G-DISCO Development Board"
diff --git a/boards/arm/stm32f412g_disco/Kconfig.defconfig b/boards/arm/stm32f412g_disco/Kconfig.defconfig
index 50d8696..37f4acc 100644
--- a/boards/arm/stm32f412g_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f412g_disco/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - STM32F412G-DISCO board configuration
-#
+# STM32F412G-DISCO board configuration
+
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F412G_DISCO
 
diff --git a/boards/arm/stm32f429i_disc1/Kconfig.board b/boards/arm/stm32f429i_disc1/Kconfig.board
index 9b8f51e..07ecfb8 100644
--- a/boards/arm/stm32f429i_disc1/Kconfig.board
+++ b/boards/arm/stm32f429i_disc1/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F4DISCOVERY board configuration
-#
+# STM32F4DISCOVERY board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F429I_DISC1
 	bool "STM32F429I-DISC1 Development Board"
diff --git a/boards/arm/stm32f429i_disc1/Kconfig.defconfig b/boards/arm/stm32f429i_disc1/Kconfig.defconfig
index 8b47b90..2ac7a7f 100644
--- a/boards/arm/stm32f429i_disc1/Kconfig.defconfig
+++ b/boards/arm/stm32f429i_disc1/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F4DISCOVERY board configuration
-#
+# STM32F4DISCOVERY board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F429I_DISC1
 
diff --git a/boards/arm/stm32f469i_disco/Kconfig.board b/boards/arm/stm32f469i_disco/Kconfig.board
index ca16e9d..5dc1cf8 100644
--- a/boards/arm/stm32f469i_disco/Kconfig.board
+++ b/boards/arm/stm32f469i_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F469I-DISCO board configuration
-#
+# STM32F469I-DISCO board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F469I_DISCO
 	bool "STM32F469I-DISCO Development Board"
diff --git a/boards/arm/stm32f469i_disco/Kconfig.defconfig b/boards/arm/stm32f469i_disco/Kconfig.defconfig
index 036f2ff..75e3000 100644
--- a/boards/arm/stm32f469i_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f469i_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F469I-DISCO board configuration
-#
+# STM32F469I-DISCO board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F469I_DISCO
 
diff --git a/boards/arm/stm32f4_disco/Kconfig.board b/boards/arm/stm32f4_disco/Kconfig.board
index 394de36..e378800 100644
--- a/boards/arm/stm32f4_disco/Kconfig.board
+++ b/boards/arm/stm32f4_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F4DISCOVERY board configuration
-#
+# STM32F4DISCOVERY board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F4_DISCO
 	bool "STM32F4DISCOVERY Development Board"
diff --git a/boards/arm/stm32f4_disco/Kconfig.defconfig b/boards/arm/stm32f4_disco/Kconfig.defconfig
index 3341b7b..843fe7c 100644
--- a/boards/arm/stm32f4_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f4_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F4DISCOVERY board configuration
-#
+# STM32F4DISCOVERY board configuration
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F4_DISCO
 
diff --git a/boards/arm/stm32f723e_disco/Kconfig.board b/boards/arm/stm32f723e_disco/Kconfig.board
index aef1260..8710106 100644
--- a/boards/arm/stm32f723e_disco/Kconfig.board
+++ b/boards/arm/stm32f723e_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F723E Discovery board configuration
-#
+# STM32F723E Discovery board configuration
+
 # Copyright (c) 2018 Aurelien Jarno
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F723E_DISCO
 	bool "STM32F723E Discovery Development Board"
diff --git a/boards/arm/stm32f723e_disco/Kconfig.defconfig b/boards/arm/stm32f723e_disco/Kconfig.defconfig
index bc0a687..7e5ddee 100644
--- a/boards/arm/stm32f723e_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f723e_disco/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - STM32F723E DISCOVERY board configuration
-#
-# Copyright (c) 2018 Aurelien Jarno
+# STM32F723E DISCOVERY board configuration
 
-#
+# Copyright (c) 2018 Aurelien Jarno
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F723E_DISCO
 
diff --git a/boards/arm/stm32f746g_disco/Kconfig.board b/boards/arm/stm32f746g_disco/Kconfig.board
index be74631..b191660 100644
--- a/boards/arm/stm32f746g_disco/Kconfig.board
+++ b/boards/arm/stm32f746g_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F746G Discovery board configuration
-#
+# STM32F746G Discovery board configuration
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F746G_DISCO
 	bool "STM32F746G Discovery Development Board"
diff --git a/boards/arm/stm32f746g_disco/Kconfig.defconfig b/boards/arm/stm32f746g_disco/Kconfig.defconfig
index 2061724..51203b4 100644
--- a/boards/arm/stm32f746g_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f746g_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F746G DISCOVERY board configuration
-#
+# STM32F746G DISCOVERY board configuration
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F746G_DISCO
 
diff --git a/boards/arm/stm32f769i_disco/Kconfig.board b/boards/arm/stm32f769i_disco/Kconfig.board
index 7f69e64..80c1b3e 100644
--- a/boards/arm/stm32f769i_disco/Kconfig.board
+++ b/boards/arm/stm32f769i_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32F769I Discovery board configuration
-#
+# STM32F769I Discovery board configuration
+
 # Copyright (c) 2018 Yong Jin
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32F769I_DISCO
 	bool "STM32F769I Discovery Development Board"
diff --git a/boards/arm/stm32f769i_disco/Kconfig.defconfig b/boards/arm/stm32f769i_disco/Kconfig.defconfig
index 9394f2c..75de39f 100644
--- a/boards/arm/stm32f769i_disco/Kconfig.defconfig
+++ b/boards/arm/stm32f769i_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32F769I DISCOVERY board configuration
-#
+# STM32F769I DISCOVERY board configuration
+
 # Copyright (c) 2018 Yong Jin
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32F769I_DISCO
 
diff --git a/boards/arm/stm32h747i_disco/Kconfig.board b/boards/arm/stm32h747i_disco/Kconfig.board
index f3f3058..819e6f0 100644
--- a/boards/arm/stm32h747i_disco/Kconfig.board
+++ b/boards/arm/stm32h747i_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32H747I Discovery board configuration
-#
+# STM32H747I Discovery board configuration
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32H747I_DISCO_M7
 	bool "STM32H747I Discovery Development Board"
diff --git a/boards/arm/stm32h747i_disco/Kconfig.defconfig b/boards/arm/stm32h747i_disco/Kconfig.defconfig
index 0b2e928..a59bc7d 100644
--- a/boards/arm/stm32h747i_disco/Kconfig.defconfig
+++ b/boards/arm/stm32h747i_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32H747I DISCOVERY board configuration
-#
+# STM32H747I DISCOVERY board configuration
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32H747I_DISCO_M7 || BOARD_STM32H747I_DISCO_M4
 
diff --git a/boards/arm/stm32l1_disco/Kconfig.board b/boards/arm/stm32l1_disco/Kconfig.board
index 0914497..e9621b5 100644
--- a/boards/arm/stm32l1_disco/Kconfig.board
+++ b/boards/arm/stm32l1_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - board configuration
-#
+# Board configuration
+
 # Copyright (c) 2019 eTactica ehf
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32L1_DISCO
 	bool "STM32L1DISCOVERY Development Board"
diff --git a/boards/arm/stm32l1_disco/Kconfig.defconfig b/boards/arm/stm32l1_disco/Kconfig.defconfig
index 56512e2..4671f20d 100644
--- a/boards/arm/stm32l1_disco/Kconfig.defconfig
+++ b/boards/arm/stm32l1_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - board configuration
-#
+# Board configuration
+
 # Copyright (c) 2019 eTactica ehf
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32L1_DISCO
 
diff --git a/boards/arm/stm32l476g_disco/Kconfig.board b/boards/arm/stm32l476g_disco/Kconfig.board
index 243f9b9..2aa9ec7 100644
--- a/boards/arm/stm32l476g_disco/Kconfig.board
+++ b/boards/arm/stm32l476g_disco/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32L476G Discovery board configuration
-#
+# STM32L476G Discovery board configuration
+
 # Copyright (c) 2017 Arthur Sfez
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32L476G_DISCO
 	bool "STM32L476G Discovery Development Board"
diff --git a/boards/arm/stm32l476g_disco/Kconfig.defconfig b/boards/arm/stm32l476g_disco/Kconfig.defconfig
index effab8d..a17eb7b 100644
--- a/boards/arm/stm32l476g_disco/Kconfig.defconfig
+++ b/boards/arm/stm32l476g_disco/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32L476G DISCOVERY board configuration
-#
+# STM32L476G DISCOVERY board configuration
+
 # Copyright (c) 2017 Arthur Sfez
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32L476G_DISCO
 
diff --git a/boards/arm/stm32l496g_disco/Kconfig.board b/boards/arm/stm32l496g_disco/Kconfig.board
index 0b66c8f..4d2e232 100644
--- a/boards/arm/stm32l496g_disco/Kconfig.board
+++ b/boards/arm/stm32l496g_disco/Kconfig.board
@@ -1,11 +1,9 @@
-# Kconfig - STM32L496G Discovery board configuration
-#
+# STM32L496G Discovery board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
 # Copyright (c) 2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32L496G_DISCO
 	bool "STM32L496G Discovery Development Board"
diff --git a/boards/arm/stm32l496g_disco/Kconfig.defconfig b/boards/arm/stm32l496g_disco/Kconfig.defconfig
index de67b13..173ba9d 100644
--- a/boards/arm/stm32l496g_disco/Kconfig.defconfig
+++ b/boards/arm/stm32l496g_disco/Kconfig.defconfig
@@ -1,10 +1,8 @@
-# Kconfig - STM32L476G Nucleo board configuration
-#
+# STM32L476G Nucleo board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32L496G_DISCO
 
diff --git a/boards/arm/stm32mp157c_dk2/Kconfig.board b/boards/arm/stm32mp157c_dk2/Kconfig.board
index 682c25d..b020b97 100644
--- a/boards/arm/stm32mp157c_dk2/Kconfig.board
+++ b/boards/arm/stm32mp157c_dk2/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - STM32MP157C Discovery board configuration
-#
+# STM32MP157C Discovery board configuration
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_STM32MP157C_DK2
 	bool "STM32MP157C Discovery Development 2 Board"
diff --git a/boards/arm/stm32mp157c_dk2/Kconfig.defconfig b/boards/arm/stm32mp157c_dk2/Kconfig.defconfig
index ede6136..89e4791 100644
--- a/boards/arm/stm32mp157c_dk2/Kconfig.defconfig
+++ b/boards/arm/stm32mp157c_dk2/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - STM32MP157 discovery board configuration
-#
+# STM32MP157 discovery board configuration
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_STM32MP157C_DK2
 
diff --git a/boards/arm/twr_ke18f/Kconfig b/boards/arm/twr_ke18f/Kconfig
index 60cbb0e..2ed555b 100644
--- a/boards/arm/twr_ke18f/Kconfig
+++ b/boards/arm/twr_ke18f/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - TWR-KE18F board configuration
-#
+# TWR-KE18F board configuration
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_TWR_KE18F
diff --git a/boards/arm/twr_ke18f/Kconfig.board b/boards/arm/twr_ke18f/Kconfig.board
index 5080b60..42713ad 100644
--- a/boards/arm/twr_ke18f/Kconfig.board
+++ b/boards/arm/twr_ke18f/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - TWR-KE18F board configuration
-#
+# TWR-KE18F board configuration
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_TWR_KE18F
diff --git a/boards/arm/twr_ke18f/Kconfig.defconfig b/boards/arm/twr_ke18f/Kconfig.defconfig
index 92fe5fd..57257d4 100644
--- a/boards/arm/twr_ke18f/Kconfig.defconfig
+++ b/boards/arm/twr_ke18f/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - TWR-KE18F board
-#
+# TWR-KE18F board
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_TWR_KE18F
 
diff --git a/boards/arm/udoo_neo_full_m4/Kconfig.board b/boards/arm/udoo_neo_full_m4/Kconfig.board
index a1ce832..f9f67b9 100644
--- a/boards/arm/udoo_neo_full_m4/Kconfig.board
+++ b/boards/arm/udoo_neo_full_m4/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_UDOO_NEO_FULL_M4
 	bool "UDOO Neo Full"
diff --git a/boards/arm/udoo_neo_full_m4/Kconfig.defconfig b/boards/arm/udoo_neo_full_m4/Kconfig.defconfig
index d093775..06f758c 100644
--- a/boards/arm/udoo_neo_full_m4/Kconfig.defconfig
+++ b/boards/arm/udoo_neo_full_m4/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - UDOO Neo Full board
-#
+# UDOO Neo Full board
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_UDOO_NEO_FULL_M4
 
diff --git a/boards/arm/usb_kw24d512/Kconfig.board b/boards/arm/usb_kw24d512/Kconfig.board
index 63b899c..f76553f 100644
--- a/boards/arm/usb_kw24d512/Kconfig.board
+++ b/boards/arm/usb_kw24d512/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - USB-KW24D512 board
-#
+# USB-KW24D512 board
+
 # Copyright (c) 2017, Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_USB_KW24D512
 	bool "NXP USB-KW24D512"
diff --git a/boards/arm/usb_kw24d512/Kconfig.defconfig b/boards/arm/usb_kw24d512/Kconfig.defconfig
index 0ed64fd..9562993 100644
--- a/boards/arm/usb_kw24d512/Kconfig.defconfig
+++ b/boards/arm/usb_kw24d512/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - USB-KW24D512 board
-#
+# USB-KW24D512 board
+
 # Copyright (c) 2017, Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_USB_KW24D512
 
diff --git a/boards/arm/v2m_beetle/Kconfig.board b/boards/arm/v2m_beetle/Kconfig.board
index 9b58945..6c0d883 100644
--- a/boards/arm/v2m_beetle/Kconfig.board
+++ b/boards/arm/v2m_beetle/Kconfig.board
@@ -1,10 +1,7 @@
-# Kconfig - ARM V2M Beetle Board configuration options
+# ARM V2M Beetle Board configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # V2M (V2 = Versatile Express, M = Motherboard)
 config BOARD_V2M_BEETLE
diff --git a/boards/arm/v2m_beetle/Kconfig.defconfig b/boards/arm/v2m_beetle/Kconfig.defconfig
index dcefd89..5517a25 100644
--- a/boards/arm/v2m_beetle/Kconfig.defconfig
+++ b/boards/arm/v2m_beetle/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - ARM V2M Beetle Board configuration options
+# ARM V2M Beetle Board configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_V2M_BEETLE
 
diff --git a/boards/arm/v2m_musca/Kconfig.board b/boards/arm/v2m_musca/Kconfig.board
index 725f840..da0344e 100644
--- a/boards/arm/v2m_musca/Kconfig.board
+++ b/boards/arm/v2m_musca/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MUSCA_A
 	bool "ARM Cortex-M33 SMM on V2M-MUSCA"
diff --git a/boards/arm/v2m_musca/Kconfig.defconfig b/boards/arm/v2m_musca/Kconfig.defconfig
index 3e676e4..a88dd69 100644
--- a/boards/arm/v2m_musca/Kconfig.defconfig
+++ b/boards/arm/v2m_musca/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MUSCA_A
 
diff --git a/boards/arm/v2m_musca_b1/Kconfig.board b/boards/arm/v2m_musca_b1/Kconfig.board
index 8292449..6fc9809 100644
--- a/boards/arm/v2m_musca_b1/Kconfig.board
+++ b/boards/arm/v2m_musca_b1/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MUSCA_B1
 	bool "ARM Cortex-M33 SMM on V2M-MUSCA"
diff --git a/boards/arm/v2m_musca_b1/Kconfig.defconfig b/boards/arm/v2m_musca_b1/Kconfig.defconfig
index 3e99035..c4053e3 100644
--- a/boards/arm/v2m_musca_b1/Kconfig.defconfig
+++ b/boards/arm/v2m_musca_b1/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_MUSCA_B1
 
diff --git a/boards/arm/warp7_m4/Kconfig.board b/boards/arm/warp7_m4/Kconfig.board
index 05b4a8c..8e39272 100644
--- a/boards/arm/warp7_m4/Kconfig.board
+++ b/boards/arm/warp7_m4/Kconfig.board
@@ -1,9 +1,7 @@
-# Kconfig - WaRP7 iMX7S M4 board
-#
+# WaRP7 iMX7S M4 board
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_WARP7_M4
 	bool "WaRP7 iMX7 Solo"
diff --git a/boards/arm/warp7_m4/Kconfig.defconfig b/boards/arm/warp7_m4/Kconfig.defconfig
index 069066a..114e3fe 100644
--- a/boards/arm/warp7_m4/Kconfig.defconfig
+++ b/boards/arm/warp7_m4/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig - WaRP7 iMX7S M4 board
-#
+# WaRP7 iMX7S M4 board
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_WARP7_M4
 
diff --git a/boards/riscv/hifive1_revb/Kconfig.board b/boards/riscv/hifive1_revb/Kconfig.board
index 42b408f..d4c5b99 100644
--- a/boards/riscv/hifive1_revb/Kconfig.board
+++ b/boards/riscv/hifive1_revb/Kconfig.board
@@ -1,5 +1,6 @@
 # Copyright (c) 2019 SiFive Inc.
 # SPDX-License-Identifier: Apache-2.0
+
 config BOARD_HIFIVE1_REVB
 	bool "HiFive1 Rev B target"
 	depends on SOC_RISCV_SIFIVE_FREEDOM
diff --git a/boards/riscv/hifive1_revb/Kconfig.defconfig b/boards/riscv/hifive1_revb/Kconfig.defconfig
index c80d360..6fa9f7b 100644
--- a/boards/riscv/hifive1_revb/Kconfig.defconfig
+++ b/boards/riscv/hifive1_revb/Kconfig.defconfig
@@ -1,5 +1,6 @@
 # Copyright (c) 2019 SiFive Inc.
 # SPDX-License-Identifier: Apache-2.0
+
 if BOARD_HIFIVE1_REVB
 
 config BOARD
diff --git a/boards/riscv/litex_vexriscv/Kconfig.board b/boards/riscv/litex_vexriscv/Kconfig.board
index b84b1e6..de9d802 100644
--- a/boards/riscv/litex_vexriscv/Kconfig.board
+++ b/boards/riscv/litex_vexriscv/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_LITEX_VEXRISCV
 	bool "Board with LiteX/VexRiscV CPU"
diff --git a/boards/riscv/litex_vexriscv/Kconfig.defconfig b/boards/riscv/litex_vexriscv/Kconfig.defconfig
index a8650f4..6b8a41c 100644
--- a/boards/riscv/litex_vexriscv/Kconfig.defconfig
+++ b/boards/riscv/litex_vexriscv/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_LITEX_VEXRISCV
 
diff --git a/boards/x86/acrn/Kconfig.board b/boards/x86/acrn/Kconfig.board
index 0b3d3f0..9c7d725 100644
--- a/boards/x86/acrn/Kconfig.board
+++ b/boards/x86/acrn/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_ACRN
 	bool "ACRN User OS"
diff --git a/boards/x86/acrn/Kconfig.defconfig b/boards/x86/acrn/Kconfig.defconfig
index c646654..6618613 100644
--- a/boards/x86/acrn/Kconfig.defconfig
+++ b/boards/x86/acrn/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_ACRN
 
diff --git a/boards/x86/gpmrb/Kconfig.board b/boards/x86/gpmrb/Kconfig.board
index 66c4f8f..1b6a5e3 100644
--- a/boards/x86/gpmrb/Kconfig.board
+++ b/boards/x86/gpmrb/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_GPMRB
 	bool "Gordon Peak MRB"
diff --git a/boards/x86/gpmrb/Kconfig.defconfig b/boards/x86/gpmrb/Kconfig.defconfig
index 112493f..584210b 100644
--- a/boards/x86/gpmrb/Kconfig.defconfig
+++ b/boards/x86/gpmrb/Kconfig.defconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_GPMRB
diff --git a/boards/x86/up_squared/Kconfig b/boards/x86/up_squared/Kconfig
index 925ab89..5fa9206 100644
--- a/boards/x86/up_squared/Kconfig
+++ b/boards/x86/up_squared/Kconfig
@@ -1,10 +1,7 @@
 # UP Squared board options
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BOARD_UP_SQUARED
 
diff --git a/boards/x86/up_squared/Kconfig.board b/boards/x86/up_squared/Kconfig.board
index 0febae6..16333a2 100644
--- a/boards/x86/up_squared/Kconfig.board
+++ b/boards/x86/up_squared/Kconfig.board
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_UP_SQUARED
 	bool "UP Squared"
diff --git a/boards/xtensa/esp32/Kconfig.board b/boards/xtensa/esp32/Kconfig.board
index 0294713..c6b8531 100644
--- a/boards/xtensa/esp32/Kconfig.board
+++ b/boards/xtensa/esp32/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - ESP32 board configuration
-#
+# ESP32 board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/xtensa/esp32/Kconfig.defconfig b/boards/xtensa/esp32/Kconfig.defconfig
index b091de4..3ee3357 100644
--- a/boards/xtensa/esp32/Kconfig.defconfig
+++ b/boards/xtensa/esp32/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - ESP32 board configuration
-#
+# ESP32 board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/xtensa/intel_s1000_crb/Kconfig.board b/boards/xtensa/intel_s1000_crb/Kconfig.board
index 16b3b2f..ab0ba36 100644
--- a/boards/xtensa/intel_s1000_crb/Kconfig.board
+++ b/boards/xtensa/intel_s1000_crb/Kconfig.board
@@ -1,8 +1,8 @@
-# Kconfig - XTENSA board configuration
-#
+# XTENSA board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-config  BOARD_INTEL_S1000_CRB
+config BOARD_INTEL_S1000_CRB
 	bool "Xtensa on Intel_S1000"
 	depends on SOC_INTEL_S1000
diff --git a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
index 912210b..1405bfe 100644
--- a/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
+++ b/boards/xtensa/intel_s1000_crb/Kconfig.defconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_INTEL_S1000_CRB
diff --git a/boards/xtensa/odroid_go/Kconfig.board b/boards/xtensa/odroid_go/Kconfig.board
index d99c547..ad5a483 100644
--- a/boards/xtensa/odroid_go/Kconfig.board
+++ b/boards/xtensa/odroid_go/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - ODROID-GO Game Kit configuration
-#
+# ODROID-GO Game Kit configuration
+
 # Copyright (c) 2019 Yannis Damigos
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/xtensa/odroid_go/Kconfig.defconfig b/boards/xtensa/odroid_go/Kconfig.defconfig
index ac683d5..a218554 100644
--- a/boards/xtensa/odroid_go/Kconfig.defconfig
+++ b/boards/xtensa/odroid_go/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - ODROID-GO Game Kit configuration
-#
+# ODROID-GO Game Kit configuration
+
 # Copyright (c) 2019 Yannis Damigos
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/xtensa/qemu_xtensa/Kconfig b/boards/xtensa/qemu_xtensa/Kconfig
index 4e706a8..2ecdedb 100644
--- a/boards/xtensa/qemu_xtensa/Kconfig
+++ b/boards/xtensa/qemu_xtensa/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - Xtensa Qemu board configuration
-#
+# Xtensa Qemu board configuration
+
 # Copyright (c) 2016 Cadence Design Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/boards/xtensa/qemu_xtensa/Kconfig.board b/boards/xtensa/qemu_xtensa/Kconfig.board
index 052be59..bfe3519 100644
--- a/boards/xtensa/qemu_xtensa/Kconfig.board
+++ b/boards/xtensa/qemu_xtensa/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - XTENSA board configuration
-#
+# XTENSA board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/boards/xtensa/qemu_xtensa/Kconfig.defconfig b/boards/xtensa/qemu_xtensa/Kconfig.defconfig
index f8584ad..7270568 100644
--- a/boards/xtensa/qemu_xtensa/Kconfig.defconfig
+++ b/boards/xtensa/qemu_xtensa/Kconfig.defconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_QEMU_XTENSA
diff --git a/boards/xtensa/xt-sim/Kconfig.board b/boards/xtensa/xt-sim/Kconfig.board
index a908a6b..d67c684 100644
--- a/boards/xtensa/xt-sim/Kconfig.board
+++ b/boards/xtensa/xt-sim/Kconfig.board
@@ -1,5 +1,5 @@
-# Kconfig - XTENSA board configuration
-#
+# XTENSA board configuration
+
 # Copyright (c) 2016 Cadence Design Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 3ed97cb..a42d388 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,11 +1,7 @@
-# Kconfig - drivers configuration options
+# drivers configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menu "Device Drivers"
 
diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig
index 5baffba..522b03e 100644
--- a/drivers/adc/Kconfig
+++ b/drivers/adc/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - ADC configuration options
+# ADC configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # ADC options
diff --git a/drivers/adc/Kconfig.mcux b/drivers/adc/Kconfig.mcux
index 87efc1b..18efeb4 100644
--- a/drivers/adc/Kconfig.mcux
+++ b/drivers/adc/Kconfig.mcux
@@ -1,10 +1,7 @@
-# Kconfig - ADC configuration options
+# ADC configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ADC_MCUX_ADC12
 	bool "MCUX ADC12 driver"
diff --git a/drivers/adc/Kconfig.nrfx b/drivers/adc/Kconfig.nrfx
index 1602cde..6218291 100644
--- a/drivers/adc/Kconfig.nrfx
+++ b/drivers/adc/Kconfig.nrfx
@@ -1,10 +1,7 @@
-# Kconfig - ADC configuration options
+# ADC configuration options
 
-#
 # Copyright (c) 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ADC_NRFX_ADC
 	bool "nRF ADC nrfx driver"
diff --git a/drivers/adc/Kconfig.sam0 b/drivers/adc/Kconfig.sam0
index 016a20a..3710c8b 100644
--- a/drivers/adc/Kconfig.sam0
+++ b/drivers/adc/Kconfig.sam0
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Derek Hageman <hageman@inthat.cloud>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ADC_SAM0
 	bool "Atmel SAM0 series ADC Driver"
diff --git a/drivers/adc/Kconfig.sam_afec b/drivers/adc/Kconfig.sam_afec
index 86ccbe3..295a503 100644
--- a/drivers/adc/Kconfig.sam_afec
+++ b/drivers/adc/Kconfig.sam_afec
@@ -1,10 +1,7 @@
-# Kconfig - ADC configuration options
+# ADC configuration options
 
-#
 # Copyright (c) 2017 comsuisse AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ADC_SAM_AFEC
 	bool "SAM ADC Driver"
diff --git a/drivers/adc/Kconfig.stm32 b/drivers/adc/Kconfig.stm32
index b46b9c5..68e8e0c 100644
--- a/drivers/adc/Kconfig.stm32
+++ b/drivers/adc/Kconfig.stm32
@@ -1,12 +1,9 @@
-# Kconfig - ADC configuration options
+# ADC configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
 # Copyright (c) 2019 Endre Karlson
 # Copyright (c) 2019 Song Qiang <songqiang1304521@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ADC_STM32
 	bool "STM32 ADC driver"
diff --git a/drivers/adc/Kconfig.xec b/drivers/adc/Kconfig.xec
index 3a1e7d2..cea47f1 100644
--- a/drivers/adc/Kconfig.xec
+++ b/drivers/adc/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig - Microchip XEC ADC configuration
-#
+# Microchip XEC ADC configuration
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ADC_XEC
 	bool "Microchip XEC series ADC driver"
diff --git a/drivers/audio/Kconfig b/drivers/audio/Kconfig
index 821c69c..4f74259 100644
--- a/drivers/audio/Kconfig
+++ b/drivers/audio/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Audio Codec configuration options
+# Audio Codec configuration options
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig AUDIO
 	bool "Support for Audio"
diff --git a/drivers/audio/Kconfig.intel_dmic b/drivers/audio/Kconfig.intel_dmic
index f96c383..f51243d 100644
--- a/drivers/audio/Kconfig.intel_dmic
+++ b/drivers/audio/Kconfig.intel_dmic
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config AUDIO_INTEL_DMIC
 	bool "Intel digital PDM microphone driver support"
diff --git a/drivers/audio/Kconfig.mpxxdtyy b/drivers/audio/Kconfig.mpxxdtyy
index 2842a80..eae1439 100644
--- a/drivers/audio/Kconfig.mpxxdtyy
+++ b/drivers/audio/Kconfig.mpxxdtyy
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config AUDIO_MPXXDTYY
 	bool "ST Digital PDM microphone attached to I2S support"
diff --git a/drivers/audio/Kconfig.tlv320dac b/drivers/audio/Kconfig.tlv320dac
index 7d10fbf..16b4b0a 100644
--- a/drivers/audio/Kconfig.tlv320dac
+++ b/drivers/audio/Kconfig.tlv320dac
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config AUDIO_TLV320DAC
 	bool "TLV320DAC310x DAC support"
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index dde4924..f76b0a5 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Bluetooth LE driver configuration options
+# Bluetooth LE driver configuration options
 
-#
 # Copyright (c) 2015-2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # Bluetooth options
diff --git a/drivers/bluetooth/hci/Kconfig b/drivers/bluetooth/hci/Kconfig
index f152c64..605afa3 100644
--- a/drivers/bluetooth/hci/Kconfig
+++ b/drivers/bluetooth/hci/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Bluetooth drivers configuration options
+# Bluetooth drivers configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 comment "Bluetooth HCI Driver Options"
 
diff --git a/drivers/can/Kconfig b/drivers/can/Kconfig
index da70f10..df34732 100644
--- a/drivers/can/Kconfig
+++ b/drivers/can/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - CAN configuration options
+# CAN configuration options
 
-#
 # Copyright (c) 2018 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # CAN options
diff --git a/drivers/can/Kconfig.loopback b/drivers/can/Kconfig.loopback
index 9c131fb..d197d57 100644
--- a/drivers/can/Kconfig.loopback
+++ b/drivers/can/Kconfig.loopback
@@ -1,10 +1,7 @@
-# Kconfig.loopback - CAN loopback device configuration options
+# CAN loopback device configuration options
 
-#
 # Copyright (c) 2019 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAN_LOOPBACK
 	bool "Loopback CAN driver"
diff --git a/drivers/can/Kconfig.mcp2515 b/drivers/can/Kconfig.mcp2515
index 108f818..d91cc85 100644
--- a/drivers/can/Kconfig.mcp2515
+++ b/drivers/can/Kconfig.mcp2515
@@ -1,10 +1,7 @@
-# Kconfig.mcp2515 - MCP2515 CAN configuration options
+# MCP2515 CAN configuration options
 
-#
 # Copyright (c) 2018 Karsten Koenig
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAN_MCP2515
 	bool "MCP2515 CAN Driver"
diff --git a/drivers/can/Kconfig.mcux b/drivers/can/Kconfig.mcux
index f60762c..19ad844 100644
--- a/drivers/can/Kconfig.mcux
+++ b/drivers/can/Kconfig.mcux
@@ -1,10 +1,7 @@
-# Kconfig.mcux - MCUX CAN configuration options
+# MCUX CAN configuration options
 
-#
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAN_MCUX_FLEXCAN
 	bool "MCUX FlexCAN driver"
diff --git a/drivers/can/Kconfig.net b/drivers/can/Kconfig.net
index da7b9e2..0c52206 100644
--- a/drivers/can/Kconfig.net
+++ b/drivers/can/Kconfig.net
@@ -1,10 +1,7 @@
-# Kconfig.net - Configuration options for IPv6 over CAN
+# Configuration options for IPv6 over CAN
 
-#
 # Copyright (c) 2019 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAN_NET
 	bool "Enable 6loCAN network interface [EXPERIMENTAL]"
diff --git a/drivers/can/Kconfig.stm32 b/drivers/can/Kconfig.stm32
index 90fc642..bf9abc1 100644
--- a/drivers/can/Kconfig.stm32
+++ b/drivers/can/Kconfig.stm32
@@ -1,10 +1,7 @@
-# Kconfig.stm32 - STM32 CAN configuration options
+# STM32 CAN configuration options
 
-#
 # Copyright (c) 2018 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAN_STM32
 	bool "STM32 CAN Driver"
diff --git a/drivers/clock_control/Kconfig b/drivers/clock_control/Kconfig
index c0b5c5b..3cbe388 100644
--- a/drivers/clock_control/Kconfig
+++ b/drivers/clock_control/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Clock controller driver configuration options
+# Clock controller driver configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # Clock controller drivers
diff --git a/drivers/clock_control/Kconfig.beetle b/drivers/clock_control/Kconfig.beetle
index 3672bfb..147c83b 100644
--- a/drivers/clock_control/Kconfig.beetle
+++ b/drivers/clock_control/Kconfig.beetle
@@ -1,10 +1,7 @@
-# Kconfig - Beetle MCU clock control driver config
-#
-#
+# Beetle MCU clock control driver config
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_ARM
 
diff --git a/drivers/clock_control/Kconfig.mcux_ccm b/drivers/clock_control/Kconfig.mcux_ccm
index 1f36f31..3020313 100644
--- a/drivers/clock_control/Kconfig.mcux_ccm
+++ b/drivers/clock_control/Kconfig.mcux_ccm
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK CCM
-#
+# MCUXpresso SDK CCM
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_MCUX_CCM
 	bool "MCUX CCM driver"
diff --git a/drivers/clock_control/Kconfig.mcux_mcg b/drivers/clock_control/Kconfig.mcux_mcg
index 84e83a3..eda56a2 100644
--- a/drivers/clock_control/Kconfig.mcux_mcg
+++ b/drivers/clock_control/Kconfig.mcux_mcg
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK MCG
-#
+# MCUXpresso SDK MCG
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_MCUX_MCG
 	bool "MCUX MCG driver"
diff --git a/drivers/clock_control/Kconfig.mcux_pcc b/drivers/clock_control/Kconfig.mcux_pcc
index 057f578..ff2c9f4 100644
--- a/drivers/clock_control/Kconfig.mcux_pcc
+++ b/drivers/clock_control/Kconfig.mcux_pcc
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK PCC
-#
+# MCUXpresso SDK PCC
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_MCUX_PCC
 	bool "MCUX PCC driver"
diff --git a/drivers/clock_control/Kconfig.mcux_scg b/drivers/clock_control/Kconfig.mcux_scg
index 3e04160..debd863 100644
--- a/drivers/clock_control/Kconfig.mcux_scg
+++ b/drivers/clock_control/Kconfig.mcux_scg
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK SCG
-#
+# MCUXpresso SDK SCG
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_MCUX_SCG
 	bool "MCUX SCG driver"
diff --git a/drivers/clock_control/Kconfig.mcux_sim b/drivers/clock_control/Kconfig.mcux_sim
index ad858a8..bb880cb 100644
--- a/drivers/clock_control/Kconfig.mcux_sim
+++ b/drivers/clock_control/Kconfig.mcux_sim
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK SIM
-#
+# MCUXpresso SDK SIM
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_MCUX_SIM
 	bool "MCUX SIM driver"
diff --git a/drivers/clock_control/Kconfig.nrf b/drivers/clock_control/Kconfig.nrf
index 6c2b266..84d5596 100644
--- a/drivers/clock_control/Kconfig.nrf
+++ b/drivers/clock_control/Kconfig.nrf
@@ -1,7 +1,6 @@
-# Kconfig - Clock controller driver configuration options
-#
+# Clock controller driver configuration options
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config CLOCK_CONTROL_NRF_FORCE_ALT
diff --git a/drivers/clock_control/Kconfig.rv32m1 b/drivers/clock_control/Kconfig.rv32m1
index d952469..e7b4cc2 100644
--- a/drivers/clock_control/Kconfig.rv32m1
+++ b/drivers/clock_control/Kconfig.rv32m1
@@ -1,9 +1,7 @@
-# Kconfig - OpenISA RV32M1 PPC
-#
+# OpenISA RV32M1 PPC
+
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CLOCK_CONTROL_RV32M1_PCC
 	bool "RV32M1 PCC driver"
diff --git a/drivers/clock_control/Kconfig.stm32 b/drivers/clock_control/Kconfig.stm32
index dd38dd1..85acf21 100644
--- a/drivers/clock_control/Kconfig.stm32
+++ b/drivers/clock_control/Kconfig.stm32
@@ -1,10 +1,8 @@
-# Kconfig - STM32 MCU clock control driver config
-#
+# STM32 MCU clock control driver config
+
 # Copyright (c) 2017 Linaro
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_FAMILY_STM32
 
diff --git a/drivers/clock_control/Kconfig.stm32f0_f3 b/drivers/clock_control/Kconfig.stm32f0_f3
index a32b24d..822f825 100644
--- a/drivers/clock_control/Kconfig.stm32f0_f3
+++ b/drivers/clock_control/Kconfig.stm32f0_f3
@@ -1,9 +1,7 @@
-# Kconfig - STM32F0 and STM32F3 PLL configuration options
-#
+# STM32F0 and STM32F3 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X
 
diff --git a/drivers/clock_control/Kconfig.stm32f1 b/drivers/clock_control/Kconfig.stm32f1
index b96a167..d5ec7e0 100644
--- a/drivers/clock_control/Kconfig.stm32f1
+++ b/drivers/clock_control/Kconfig.stm32f1
@@ -1,9 +1,7 @@
-# Kconfig - STM32F1 PLL configuration options
-#
+# STM32F1 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32F1X
 
diff --git a/drivers/clock_control/Kconfig.stm32f2_f4_f7 b/drivers/clock_control/Kconfig.stm32f2_f4_f7
index ff7fba1..70e2030 100644
--- a/drivers/clock_control/Kconfig.stm32f2_f4_f7
+++ b/drivers/clock_control/Kconfig.stm32f2_f4_f7
@@ -1,9 +1,7 @@
-# Kconfig - STM32F2, STM32F4 and STM32F7 PLL configuration options
-#
+# STM32F2, STM32F4 and STM32F7 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32F2X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X
 
diff --git a/drivers/clock_control/Kconfig.stm32g0 b/drivers/clock_control/Kconfig.stm32g0
index 0084c7b..6b4d5bc 100644
--- a/drivers/clock_control/Kconfig.stm32g0
+++ b/drivers/clock_control/Kconfig.stm32g0
@@ -1,9 +1,7 @@
-# Kconfig - STM32G0 PLL configuration options
-#
+# STM32G0 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32G0X
 
diff --git a/drivers/clock_control/Kconfig.stm32g4 b/drivers/clock_control/Kconfig.stm32g4
index cfe9d36..2b9bc2e 100644
--- a/drivers/clock_control/Kconfig.stm32g4
+++ b/drivers/clock_control/Kconfig.stm32g4
@@ -1,9 +1,7 @@
-# Kconfig - STM32G4 PLL configuration options
-#
+# STM32G4 PLL configuration options
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32G4X
 
diff --git a/drivers/clock_control/Kconfig.stm32h7 b/drivers/clock_control/Kconfig.stm32h7
index d2d3077..601208b 100644
--- a/drivers/clock_control/Kconfig.stm32h7
+++ b/drivers/clock_control/Kconfig.stm32h7
@@ -1,9 +1,7 @@
-# Kconfig - STM32H7 PLL configuration options
-#
+# STM32H7 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32H7X
 
diff --git a/drivers/clock_control/Kconfig.stm32l0_l1 b/drivers/clock_control/Kconfig.stm32l0_l1
index 1bb0155..b063678 100644
--- a/drivers/clock_control/Kconfig.stm32l0_l1
+++ b/drivers/clock_control/Kconfig.stm32l0_l1
@@ -1,9 +1,7 @@
-# Kconfig - STM32L0 and STM32L1 PLL configuration options
-#
+# STM32L0 and STM32L1 PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32L0X || SOC_SERIES_STM32L1X
 
diff --git a/drivers/clock_control/Kconfig.stm32l4_wb b/drivers/clock_control/Kconfig.stm32l4_wb
index b83cb8e..0f7fed5 100644
--- a/drivers/clock_control/Kconfig.stm32l4_wb
+++ b/drivers/clock_control/Kconfig.stm32l4_wb
@@ -1,9 +1,7 @@
-# Kconfig - STM32L4 and STM32WB PLL configuration options
-#
+# STM32L4 and STM32WB PLL configuration options
+
 # Copyright (c) 2019 Linaro
-#
-#  SPDX-License-Identifier: Apache-2.0
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_STM32L4X || SOC_SERIES_STM32WBX
 
diff --git a/drivers/console/Kconfig b/drivers/console/Kconfig
index 3a7b168..f4c2147 100644
--- a/drivers/console/Kconfig
+++ b/drivers/console/Kconfig
@@ -1,11 +1,8 @@
-# Kconfig - console driver configuration options
+# Console driver configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Cadence Design Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Setting shared by different subsystems
 
diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
index a28e96c..6d2d76e 100644
--- a/drivers/counter/Kconfig
+++ b/drivers/counter/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - counter configuration options
+# Counter configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig COUNTER
 	bool "Counter Drivers"
diff --git a/drivers/counter/Kconfig.cmos b/drivers/counter/Kconfig.cmos
index bf20e0a..cdb65f1 100644
--- a/drivers/counter/Kconfig.cmos
+++ b/drivers/counter/Kconfig.cmos
@@ -1,5 +1,5 @@
-# Kconfig - counter driver for x86 "CMOS" clock
-#
+# Counter driver for x86 "CMOS" clock
+
 # Copyright (c) 2019 Intel Corp.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/counter/Kconfig.dtmr_cmsdk_apb b/drivers/counter/Kconfig.dtmr_cmsdk_apb
index 2d9157a..310de80 100644
--- a/drivers/counter/Kconfig.dtmr_cmsdk_apb
+++ b/drivers/counter/Kconfig.dtmr_cmsdk_apb
@@ -1,10 +1,7 @@
-# Kconfig - counter and timer configuration options
-#
-#
+# Counter and timer configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_ARM
 
diff --git a/drivers/counter/Kconfig.gecko b/drivers/counter/Kconfig.gecko
index 9a8184e..9424a53 100644
--- a/drivers/counter/Kconfig.gecko
+++ b/drivers/counter/Kconfig.gecko
@@ -1,7 +1,6 @@
-# Kconfig - Silicon Labs Gecko Counter driver config
-#
+# Silicon Labs Gecko Counter driver config
+
 # Copyright (c) 2019, Piotr Mienkowski
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config COUNTER_GECKO_RTCC
diff --git a/drivers/counter/Kconfig.imx_epit b/drivers/counter/Kconfig.imx_epit
index 8826428..c466f64 100644
--- a/drivers/counter/Kconfig.imx_epit
+++ b/drivers/counter/Kconfig.imx_epit
@@ -1,9 +1,7 @@
-# Kconfig.imx_epit - IMX EPIT configuration options
-#
+# IMX EPIT configuration options
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config COUNTER_IMX_EPIT
 	bool "IMX EPIT driver"
diff --git a/drivers/counter/Kconfig.mcux_gpt b/drivers/counter/Kconfig.mcux_gpt
index 6234461..0719967 100644
--- a/drivers/counter/Kconfig.mcux_gpt
+++ b/drivers/counter/Kconfig.mcux_gpt
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK RTC
-#
+# MCUXpresso SDK RTC
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig COUNTER_MCUX_GPT
 	bool "MCUX GPT driver"
diff --git a/drivers/counter/Kconfig.mcux_rtc b/drivers/counter/Kconfig.mcux_rtc
index 5369590..5f4284e 100644
--- a/drivers/counter/Kconfig.mcux_rtc
+++ b/drivers/counter/Kconfig.mcux_rtc
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK RTC
-#
+# MCUXpresso SDK RTC
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config COUNTER_MCUX_RTC
 	bool "MCUX RTC driver"
diff --git a/drivers/counter/Kconfig.nrfx b/drivers/counter/Kconfig.nrfx
index 56cfe5b..5b5dfcb 100644
--- a/drivers/counter/Kconfig.nrfx
+++ b/drivers/counter/Kconfig.nrfx
@@ -1,7 +1,6 @@
 # Copyright (c) 2017 - 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config COUNTER_NRF_TIMER
 	bool
 
diff --git a/drivers/counter/Kconfig.sam0 b/drivers/counter/Kconfig.sam0
index 1aed3d7..e71d24a 100644
--- a/drivers/counter/Kconfig.sam0
+++ b/drivers/counter/Kconfig.sam0
@@ -1,7 +1,5 @@
 # Copyright (c) 2019 Derek Hageman <hageman@inthat.cloud>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig COUNTER_SAM0_TC32
 	bool "SAM0 series 32-bit basic timer driver"
diff --git a/drivers/counter/Kconfig.stm32_rtc b/drivers/counter/Kconfig.stm32_rtc
index b213d79..67236ae 100644
--- a/drivers/counter/Kconfig.stm32_rtc
+++ b/drivers/counter/Kconfig.stm32_rtc
@@ -1,9 +1,7 @@
-# Kconfig - STM32 Cube LL RTC
-#
+# STM32 Cube LL RTC
+
 # Copyright (c) 2018, Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig COUNTER_RTC_STM32
 	bool "STM32 Counter RTC driver"
diff --git a/drivers/counter/Kconfig.template.sam0_tc32 b/drivers/counter/Kconfig.template.sam0_tc32
index 72934c3..129ae24 100644
--- a/drivers/counter/Kconfig.template.sam0_tc32
+++ b/drivers/counter/Kconfig.template.sam0_tc32
@@ -1,8 +1,5 @@
 # Copyright (c) 2019 Derek Hageman <hageman@inthat.cloud>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 choice
 	bool "Timer $(index) prescaler"
diff --git a/drivers/counter/Kconfig.tmr_cmsdk_apb b/drivers/counter/Kconfig.tmr_cmsdk_apb
index 9f6abdd..f70a3c6 100644
--- a/drivers/counter/Kconfig.tmr_cmsdk_apb
+++ b/drivers/counter/Kconfig.tmr_cmsdk_apb
@@ -1,10 +1,7 @@
-# Kconfig - counter and timer configuration options
-#
-#
+# Counter and timer configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_ARM
 
diff --git a/drivers/counter/Kconfig.xec b/drivers/counter/Kconfig.xec
index 2c570b1..1dd8179 100644
--- a/drivers/counter/Kconfig.xec
+++ b/drivers/counter/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - XEC counter configuration options
-#
+# XEC counter configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config COUNTER_XEC
 	bool "Microchip XEC series counter driver"
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d1cb1d7..a4d08d5 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Crypto configuration options
-#
-# Copyright (c) 2017 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Crypto configuration options
 
+# Copyright (c) 2017 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
 
 #
 # CRYPTO options
diff --git a/drivers/crypto/Kconfig.ataes132a b/drivers/crypto/Kconfig.ataes132a
index b6c6911..4f1bcc7 100644
--- a/drivers/crypto/Kconfig.ataes132a
+++ b/drivers/crypto/Kconfig.ataes132a
@@ -1,10 +1,7 @@
-# Kconfig - Atmel ATAES132A configuration options
+# Atmel ATAES132A configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig CRYPTO_ATAES132A
 	bool "Atmel ATAES132A 32k AES Serial EEPROM support"
diff --git a/drivers/display/Kconfig b/drivers/display/Kconfig
index 2dd9da7..f6e5273 100644
--- a/drivers/display/Kconfig
+++ b/drivers/display/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Display drivers
+# Display drivers
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig DISPLAY
 	bool "Display Drivers"
diff --git a/drivers/display/Kconfig.dummy b/drivers/display/Kconfig.dummy
index 69cd06e..b1d566d 100644
--- a/drivers/display/Kconfig.dummy
+++ b/drivers/display/Kconfig.dummy
@@ -1,10 +1,7 @@
-# Kconfig - Configuration options for dummy display
+# Configuration options for dummy display
 
-#
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig DUMMY_DISPLAY
 	bool "Dummy display driver"
diff --git a/drivers/display/Kconfig.ili9340 b/drivers/display/Kconfig.ili9340
index c2329c4..c5294c2 100644
--- a/drivers/display/Kconfig.ili9340
+++ b/drivers/display/Kconfig.ili9340
@@ -1,10 +1,7 @@
-# Kconfig - ILI9340 display driver configuration options
+# ILI9340 display driver configuration options
 
-#
 # Copyright (c) 2017 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ILI9340
 	bool "ILI9340 display driver"
diff --git a/drivers/display/Kconfig.mcux_elcdif b/drivers/display/Kconfig.mcux_elcdif
index 7a2f4db..7c1f467 100644
--- a/drivers/display/Kconfig.mcux_elcdif
+++ b/drivers/display/Kconfig.mcux_elcdif
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig DISPLAY_MCUX_ELCDIF
 	bool "MCUX eLCDIF driver"
diff --git a/drivers/display/Kconfig.microbit b/drivers/display/Kconfig.microbit
index 2a70ee0..9929464 100644
--- a/drivers/display/Kconfig.microbit
+++ b/drivers/display/Kconfig.microbit
@@ -1,10 +1,7 @@
-# Kconfig - Microbit display driver configuration options
+# Microbit display driver configuration options
 
-#
 # Copyright (c) 2017 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config MICROBIT_DISPLAY
 	bool "BBC micro:bit 5x5 LED Display support"
diff --git a/drivers/display/Kconfig.sdl b/drivers/display/Kconfig.sdl
index 39a7216..a25986f 100644
--- a/drivers/display/Kconfig.sdl
+++ b/drivers/display/Kconfig.sdl
@@ -1,10 +1,7 @@
-# Kconfig - SDL based emulated display configuration options
+# SDL based emulated display configuration options
 
-#
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SDL_DISPLAY
 	bool "SDL based emulated display"
diff --git a/drivers/display/Kconfig.ssd1306 b/drivers/display/Kconfig.ssd1306
index 0239769..6ec0da3 100644
--- a/drivers/display/Kconfig.ssd1306
+++ b/drivers/display/Kconfig.ssd1306
@@ -1,10 +1,7 @@
-# Kconfig - SSD1306 display controller configuration options
+# SSD1306 display controller configuration options
 
-#
 # Copyright (c) 2018 Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SSD1306
 	bool "SSD1306 display driver"
diff --git a/drivers/display/Kconfig.ssd16xx b/drivers/display/Kconfig.ssd16xx
index ad0a5f0..3f79fca 100644
--- a/drivers/display/Kconfig.ssd16xx
+++ b/drivers/display/Kconfig.ssd16xx
@@ -1,10 +1,7 @@
-# Kconfig - SSD16XX display controller configuration options
+# SSD16XX display controller configuration options
 
-#
 # Copyright (c) 2018 Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SSD16XX
 	bool "SSD16XX compatible display controller driver"
diff --git a/drivers/display/Kconfig.st7789v b/drivers/display/Kconfig.st7789v
index 342910f..42e843e 100644
--- a/drivers/display/Kconfig.st7789v
+++ b/drivers/display/Kconfig.st7789v
@@ -1,10 +1,7 @@
-# Kconfig - ST7789V display driver configuration options
+# ST7789V display driver configuration options
 
-#
 # Copyright (c) 2019 Marc Reilly <marc@cpdesign.com.au>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ST7789V
 	bool "ST7789V display driver"
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index e972bc4..44a3bcb 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - DMA configuration options
-#
-#
+# DMA configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # DMA options
diff --git a/drivers/dma/Kconfig.cavs b/drivers/dma/Kconfig.cavs
index df86161..a5ded58 100644
--- a/drivers/dma/Kconfig.cavs
+++ b/drivers/dma/Kconfig.cavs
@@ -1,10 +1,7 @@
-# Kconfig.cavs - CAVS DMA configuration options
-#
-#
+# CAVS DMA configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config DMA_CAVS
 	bool "Enable CAVS DMA driver"
diff --git a/drivers/dma/Kconfig.nios2_msgdma b/drivers/dma/Kconfig.nios2_msgdma
index f307caa..7e1c62b 100644
--- a/drivers/dma/Kconfig.nios2_msgdma
+++ b/drivers/dma/Kconfig.nios2_msgdma
@@ -1,9 +1,7 @@
-# Kconfig - Nios-II mSGDMA driver configuration options
-#
+# Nios-II mSGDMA driver configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config DMA_NIOS2_MSGDMA
 	bool "Nios-II  Modular Scatter-Gather DMA(MSGDMA) driver"
diff --git a/drivers/dma/Kconfig.sam0 b/drivers/dma/Kconfig.sam0
index 19556d5..bdeacce 100644
--- a/drivers/dma/Kconfig.sam0
+++ b/drivers/dma/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM DMAC configuration options
-#
+# Atmel SAM DMAC configuration options
+
 # Copyright (c) 2018 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/dma/Kconfig.sam_xdmac b/drivers/dma/Kconfig.sam_xdmac
index 53b99ca..5a5a34d 100644
--- a/drivers/dma/Kconfig.sam_xdmac
+++ b/drivers/dma/Kconfig.sam_xdmac
@@ -1,9 +1,7 @@
-# Kconfig - Atmel XDMAC SAM driver configuration options
-#
+# Atmel XDMAC SAM driver configuration options
+
 # Copyright (c) 2017 Piotr Mienkowski
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config DMA_SAM_XDMAC
 	bool "Atmel SAM DMA (XDMAC) driver"
diff --git a/drivers/dma/Kconfig.stm32f4x b/drivers/dma/Kconfig.stm32f4x
index 372a7da..c641b39 100644
--- a/drivers/dma/Kconfig.stm32f4x
+++ b/drivers/dma/Kconfig.stm32f4x
@@ -1,10 +1,7 @@
-# Kconfig - DMA configuration options
-#
-#
+# DMA configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config DMA_STM32F4X
 	bool "Enable STM32F4x DMA driver"
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index 24ec9b1..c2351b8 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - entropy generator driver configuration options
+# Entropy generator driver configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ENTROPY_GENERATOR
 	bool "Entropy Drivers"
diff --git a/drivers/entropy/Kconfig.cc13xx_cc26xx b/drivers/entropy/Kconfig.cc13xx_cc26xx
index 209e5a1..568dbc1 100644
--- a/drivers/entropy/Kconfig.cc13xx_cc26xx
+++ b/drivers/entropy/Kconfig.cc13xx_cc26xx
@@ -1,7 +1,6 @@
-# Kconfig.cc13xx_cc26xx - TI CC13xx / CC26xx entropy driver configuration
-#
+# TI CC13xx / CC26xx entropy driver configuration
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_CC13XX_CC26XX_RNG
diff --git a/drivers/entropy/Kconfig.esp32 b/drivers/entropy/Kconfig.esp32
index c1eed88..45b159c 100644
--- a/drivers/entropy/Kconfig.esp32
+++ b/drivers/entropy/Kconfig.esp32
@@ -1,7 +1,6 @@
-# Kconfig.esp32 - esp32 entropy generator driver configuration
-#
+# esp32 entropy generator driver configuration
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_ESP32_RNG
diff --git a/drivers/entropy/Kconfig.mcux b/drivers/entropy/Kconfig.mcux
index 993c3f6..83281f7 100644
--- a/drivers/entropy/Kconfig.mcux
+++ b/drivers/entropy/Kconfig.mcux
@@ -1,7 +1,6 @@
-# Kconfig.mcux - mcux entropy generator driver configuration
-#
+# mcux entropy generator driver configuration
+
 # Copyright (c) 2016 ARM Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_MCUX_RNGA
diff --git a/drivers/entropy/Kconfig.nrf5 b/drivers/entropy/Kconfig.nrf5
index b64e03f..daa4ebf 100644
--- a/drivers/entropy/Kconfig.nrf5
+++ b/drivers/entropy/Kconfig.nrf5
@@ -1,8 +1,7 @@
-# Kconfig.nrf5 - nRF5 entropy generator driver configuration
-#
+# nRF5 entropy generator driver configuration
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
 # Copyright (c) 2017 Exati Tecnologia Ltda.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_NRF_FORCE_ALT
diff --git a/drivers/entropy/Kconfig.sam b/drivers/entropy/Kconfig.sam
index 0063102..f5be7c4 100644
--- a/drivers/entropy/Kconfig.sam
+++ b/drivers/entropy/Kconfig.sam
@@ -1,7 +1,6 @@
-# Kconfig.sam - Atmel SAM TRNG configuration
-#
+# Atmel SAM TRNG configuration
+
 # Copyright (c) 2018 Aurelien Jarno
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_SAM_RNG
diff --git a/drivers/entropy/Kconfig.stm32 b/drivers/entropy/Kconfig.stm32
index c04f200..42cfc41 100644
--- a/drivers/entropy/Kconfig.stm32
+++ b/drivers/entropy/Kconfig.stm32
@@ -1,7 +1,6 @@
-# Kconfig.stm32 - STM32 entropy generator driver configuration
-#
+# STM32 entropy generator driver configuration
+
 # Copyright (c) 2017 Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config ENTROPY_STM32_RNG
diff --git a/drivers/espi/Kconfig b/drivers/espi/Kconfig
index 7696217..f3ebc65 100644
--- a/drivers/espi/Kconfig
+++ b/drivers/espi/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - eSPI configuration options
-#
+# eSPI configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ESPI
 	bool "ESPI Driver"
diff --git a/drivers/espi/Kconfig.xec b/drivers/espi/Kconfig.xec
index 920c394..1edbae7 100644
--- a/drivers/espi/Kconfig.xec
+++ b/drivers/espi/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC ESPI configuration options
-#
+# Microchip XEC ESPI configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ESPI_XEC
 	bool "XEC Microchip ESPI driver"
diff --git a/drivers/ethernet/Kconfig b/drivers/ethernet/Kconfig
index e1593c8..4dba466 100644
--- a/drivers/ethernet/Kconfig
+++ b/drivers/ethernet/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig -  Ethernet drivers configuration options
+# Ethernet drivers configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Ethernet Drivers"
 	depends on NET_L2_ETHERNET
diff --git a/drivers/ethernet/Kconfig.e1000 b/drivers/ethernet/Kconfig.e1000
index 0a4b128a..4079709 100644
--- a/drivers/ethernet/Kconfig.e1000
+++ b/drivers/ethernet/Kconfig.e1000
@@ -1,10 +1,7 @@
-# Kconfig - Intel(R) PRO/1000 Gigabit Ethernet driver configuration options
+# Intel(R) PRO/1000 Gigabit Ethernet driver configuration options
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_E1000
 	bool "Intel(R) PRO/1000 Gigabit Ethernet driver"
diff --git a/drivers/ethernet/Kconfig.enc28j60 b/drivers/ethernet/Kconfig.enc28j60
index a66adc0..f35c61e 100644
--- a/drivers/ethernet/Kconfig.enc28j60
+++ b/drivers/ethernet/Kconfig.enc28j60
@@ -1,10 +1,7 @@
-# Kconfig - ETH_ENC28J60 Ethernet driver configuration options
+# ETH_ENC28J60 Ethernet driver configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_ENC28J60
 	bool "ENC28J60C Ethernet Controller"
diff --git a/drivers/ethernet/Kconfig.enc424j600 b/drivers/ethernet/Kconfig.enc424j600
index 279f9e4..321913d 100644
--- a/drivers/ethernet/Kconfig.enc424j600
+++ b/drivers/ethernet/Kconfig.enc424j600
@@ -1,10 +1,7 @@
-# Kconfig - ENC424J600 Ethernet driver configuration options
+# ENC424J600 Ethernet driver configuration options
 
-#
 # Copyright (c) 2019 PHYTEC Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_ENC424J600
 	bool "ENC424J600C Ethernet Controller"
diff --git a/drivers/ethernet/Kconfig.liteeth b/drivers/ethernet/Kconfig.liteeth
index 2264d6c..368074d 100644
--- a/drivers/ethernet/Kconfig.liteeth
+++ b/drivers/ethernet/Kconfig.liteeth
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Antmicro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_LITEETH
 	bool "LiteEth Ethernet core driver"
diff --git a/drivers/ethernet/Kconfig.mcux b/drivers/ethernet/Kconfig.mcux
index 060d79c..5114813 100644
--- a/drivers/ethernet/Kconfig.mcux
+++ b/drivers/ethernet/Kconfig.mcux
@@ -1,7 +1,6 @@
-# Kconfig - ETH_MCUX Ethernet driver configuration options
+# ETH_MCUX Ethernet driver configuration options
 
 # Copyright (c) 2016-2017 ARM Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig ETH_MCUX
diff --git a/drivers/ethernet/Kconfig.native_posix b/drivers/ethernet/Kconfig.native_posix
index 8344a0f..68fd86c 100644
--- a/drivers/ethernet/Kconfig.native_posix
+++ b/drivers/ethernet/Kconfig.native_posix
@@ -1,7 +1,6 @@
-# Kconfig - Native posix ethernet driver configuration options
+# Native posix ethernet driver configuration options
 
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig ETH_NATIVE_POSIX
diff --git a/drivers/ethernet/Kconfig.sam_gmac b/drivers/ethernet/Kconfig.sam_gmac
index 590968a..6db966b 100644
--- a/drivers/ethernet/Kconfig.sam_gmac
+++ b/drivers/ethernet/Kconfig.sam_gmac
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM Ethernet (GMAC) driver configuration options
-#
+# Atmel SAM Ethernet (GMAC) driver configuration options
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_SAM_GMAC
 	bool "Atmel SAM Ethernet driver"
diff --git a/drivers/ethernet/Kconfig.smsc911x b/drivers/ethernet/Kconfig.smsc911x
index 74ea16c..9f6f2c6 100644
--- a/drivers/ethernet/Kconfig.smsc911x
+++ b/drivers/ethernet/Kconfig.smsc911x
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_SMSC911X
 	bool "SMSC911x/9220 Ethernet driver"
diff --git a/drivers/ethernet/Kconfig.stellaris b/drivers/ethernet/Kconfig.stellaris
index e62743c..b1eb0f2 100644
--- a/drivers/ethernet/Kconfig.stellaris
+++ b/drivers/ethernet/Kconfig.stellaris
@@ -1,10 +1,7 @@
-# Kconfig - ETH_STELLARIS Ethernet driver configuration options
+# ETH_STELLARIS Ethernet driver configuration options
 
-#
 # Copyright (c) 2018 Zilogic Systems
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_STELLARIS
 	bool "Enable TI Stellaris MCU family ethernet driver."
diff --git a/drivers/ethernet/Kconfig.stm32_hal b/drivers/ethernet/Kconfig.stm32_hal
index d3d3449..1cd99e4 100644
--- a/drivers/ethernet/Kconfig.stm32_hal
+++ b/drivers/ethernet/Kconfig.stm32_hal
@@ -1,10 +1,7 @@
-# Kconfig - STM32 HAL Ethernet driver configuration options
+# STM32 HAL Ethernet driver configuration options
 
-#
 # Copyright (c) 2017 Erwin Rol <erwin@erwinrol.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ETH_STM32_HAL
 	bool "STM32 HAL Ethernet driver"
diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig
index 6212b39..d67d825 100644
--- a/drivers/flash/Kconfig
+++ b/drivers/flash/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Flash driver configuration options
+# Flash driver configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # Flash driver
diff --git a/drivers/flash/Kconfig.gecko b/drivers/flash/Kconfig.gecko
index 41d3525..750abbc 100644
--- a/drivers/flash/Kconfig.gecko
+++ b/drivers/flash/Kconfig.gecko
@@ -1,7 +1,6 @@
-# Kconfig - Silicon Labs Gecko flash driver config
-#
+# Silicon Labs Gecko flash driver config
+
 # Copyright (c) 2018, Piotr Mienkowski
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_FLASH_GECKO
diff --git a/drivers/flash/Kconfig.native_posix b/drivers/flash/Kconfig.native_posix
index 00947df..b51cd74 100644
--- a/drivers/flash/Kconfig.native_posix
+++ b/drivers/flash/Kconfig.native_posix
@@ -1,7 +1,6 @@
-# Kconfig - Native POSIX Flash driver
-#
+# Native POSIX Flash driver
+
 # Copyright (c) 2019, Jan Van Winkel (jan.van_winkel@dxplore.eu)
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig FLASH_NATIVE_POSIX
diff --git a/drivers/flash/Kconfig.nor b/drivers/flash/Kconfig.nor
index dbb4789..1b6a7e4 100644
--- a/drivers/flash/Kconfig.nor
+++ b/drivers/flash/Kconfig.nor
@@ -1,9 +1,5 @@
-#
 # Copyright (c) 2018 Savoir-Faire Linux.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menuconfig SPI_NOR
 	bool "SPI NOR Flash"
diff --git a/drivers/flash/Kconfig.rv32m1 b/drivers/flash/Kconfig.rv32m1
index 3fa4b1c..66ed1d8 100644
--- a/drivers/flash/Kconfig.rv32m1
+++ b/drivers/flash/Kconfig.rv32m1
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FLASH_RV32M1
 	bool "RV32M1 flash shim driver"
diff --git a/drivers/flash/Kconfig.sam b/drivers/flash/Kconfig.sam
index e01c8b7..d7142b6 100644
--- a/drivers/flash/Kconfig.sam
+++ b/drivers/flash/Kconfig.sam
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM flash driver config
-#
+# Atmel SAM flash driver config
+
 # Copyright (c) 2018 Aurelien Jarno
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/flash/Kconfig.sam0 b/drivers/flash/Kconfig.sam0
index 0f7b842..1720fef 100644
--- a/drivers/flash/Kconfig.sam0
+++ b/drivers/flash/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 flash driver config
-#
+# Atmel SAM0 flash driver config
+
 # Copyright (c) 2018 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/flash/Kconfig.simulator b/drivers/flash/Kconfig.simulator
index 767a81d..b9d98e7 100644
--- a/drivers/flash/Kconfig.simulator
+++ b/drivers/flash/Kconfig.simulator
@@ -1,5 +1,5 @@
-# Kconfig - Flash simulator config
-#
+# Flash simulator config
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/flash/Kconfig.stm32 b/drivers/flash/Kconfig.stm32
index 7e6ada0..e4cddb3 100644
--- a/drivers/flash/Kconfig.stm32
+++ b/drivers/flash/Kconfig.stm32
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32 MCUs Flash driver config
-#
+# ST Microelectronics STM32 MCUs Flash driver config
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_STM32
 
diff --git a/drivers/flash/Kconfig.w25qxxdv b/drivers/flash/Kconfig.w25qxxdv
index be31859..24986d0 100644
--- a/drivers/flash/Kconfig.w25qxxdv
+++ b/drivers/flash/Kconfig.w25qxxdv
@@ -1,9 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menuconfig SPI_FLASH_W25QXXDV
 	bool "SPI NOR Flash Winbond W25QXXDV"
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 47f6f09..6b04682 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - GPIO configuration options
+# GPIO configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO
 	bool "GPIO Drivers"
diff --git a/drivers/gpio/Kconfig.altera_nios2 b/drivers/gpio/Kconfig.altera_nios2
index 7f09f16..bd2599d 100644
--- a/drivers/gpio/Kconfig.altera_nios2
+++ b/drivers/gpio/Kconfig.altera_nios2
@@ -1,10 +1,7 @@
-# Kconfig.altera_nios2 - Altera Nios-II GPIO configuration options
-#
-#
+# Altera Nios-II GPIO configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_ALTERA_NIOS2
 	bool "Altera Nios-II PIO Controllers"
diff --git a/drivers/gpio/Kconfig.cc13xx_cc26xx b/drivers/gpio/Kconfig.cc13xx_cc26xx
index ab06d4c..9c13330 100644
--- a/drivers/gpio/Kconfig.cc13xx_cc26xx
+++ b/drivers/gpio/Kconfig.cc13xx_cc26xx
@@ -1,9 +1,7 @@
-# Kconfig.cc13xx_cc26xx - TI CC13xx / CC26xx GPIO configuration options
-#
+# TI CC13xx / CC26xx GPIO configuration options
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config GPIO_CC13XX_CC26XX
 	bool "TI SimpleLink CC13xx / CC26xx GPIO driver"
diff --git a/drivers/gpio/Kconfig.cc2650 b/drivers/gpio/Kconfig.cc2650
index 4429729..888fbca 100644
--- a/drivers/gpio/Kconfig.cc2650
+++ b/drivers/gpio/Kconfig.cc2650
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-#
+
 # GPIO configuration options for the CC2650 SoC (Texas Instruments).
 
 menuconfig GPIO_CC2650
diff --git a/drivers/gpio/Kconfig.cc32xx b/drivers/gpio/Kconfig.cc32xx
index 0d24098..0140df3 100644
--- a/drivers/gpio/Kconfig.cc32xx
+++ b/drivers/gpio/Kconfig.cc32xx
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# CC32XX GPIO configuration options
 
-# Kconfig.cc32xx- CC32XX GPIO configuration options
-#
+# SPDX-License-Identifier: Apache-2.0
 
 menuconfig GPIO_CC32XX
 	bool "TI CC32XX GPIO driver"
diff --git a/drivers/gpio/Kconfig.cmsdk_ahb b/drivers/gpio/Kconfig.cmsdk_ahb
index a8c904c..8639aa8 100644
--- a/drivers/gpio/Kconfig.cmsdk_ahb
+++ b/drivers/gpio/Kconfig.cmsdk_ahb
@@ -1,10 +1,7 @@
-# Kconfig.cmsdk_ahb - ARM CMSDK (Cortex-M System Design Kit) AHB GPIO cfg
-#
-#
+# ARM CMSDK (Cortex-M System Design Kit) AHB GPIO cfg
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_CMSDK_AHB
 	bool "ARM CMSDK (Cortex-M System Design Kit) AHB GPIO Controllers"
diff --git a/drivers/gpio/Kconfig.dw b/drivers/gpio/Kconfig.dw
index 0762708..029905e 100644
--- a/drivers/gpio/Kconfig.dw
+++ b/drivers/gpio/Kconfig.dw
@@ -1,10 +1,7 @@
-# Kconfig.dw - DesignWare GPIO configuration options
-#
-#
+# DesignWare GPIO configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_DW
 	bool "Designware GPIO"
diff --git a/drivers/gpio/Kconfig.esp32 b/drivers/gpio/Kconfig.esp32
index e6732f1..a31ae00 100644
--- a/drivers/gpio/Kconfig.esp32
+++ b/drivers/gpio/Kconfig.esp32
@@ -1,10 +1,7 @@
-# Kconfig.esp32 - ESP32 GPIO configuration options
-#
-#
+# ESP32 GPIO configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_ESP32
 	bool "ESP32 GPIO"
diff --git a/drivers/gpio/Kconfig.gecko b/drivers/gpio/Kconfig.gecko
index 53c070c..b339625 100644
--- a/drivers/gpio/Kconfig.gecko
+++ b/drivers/gpio/Kconfig.gecko
@@ -1,9 +1,7 @@
-# Kconfig.gecko - Gecko GPIO configuration options
-#
+# Gecko GPIO configuration options
+
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_GECKO
 	bool "Gecko GPIO driver"
diff --git a/drivers/gpio/Kconfig.ht16k33 b/drivers/gpio/Kconfig.ht16k33
index 082db17..3e11879 100644
--- a/drivers/gpio/Kconfig.ht16k33
+++ b/drivers/gpio/Kconfig.ht16k33
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_HT16K33
 	bool "HT16K33 keyscan driver"
diff --git a/drivers/gpio/Kconfig.imx b/drivers/gpio/Kconfig.imx
index 6794c2d..0767176 100644
--- a/drivers/gpio/Kconfig.imx
+++ b/drivers/gpio/Kconfig.imx
@@ -1,9 +1,7 @@
-# Kconfig.imx - IMX GPIO configuration options
-#
+# IMX GPIO configuration options
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_IMX
 	bool "IMX GPIO driver"
diff --git a/drivers/gpio/Kconfig.intel b/drivers/gpio/Kconfig.intel
index 7e7f185..2395810 100644
--- a/drivers/gpio/Kconfig.intel
+++ b/drivers/gpio/Kconfig.intel
@@ -1,10 +1,7 @@
-# Kconfig.dw - Intel SoC GPIO configuration options
-#
-#
+# Intel SoC GPIO configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_INTEL_APL
 	bool "Intel Apollo Lake SoC GPIO"
diff --git a/drivers/gpio/Kconfig.mcux b/drivers/gpio/Kconfig.mcux
index be99641..165d770 100644
--- a/drivers/gpio/Kconfig.mcux
+++ b/drivers/gpio/Kconfig.mcux
@@ -1,10 +1,8 @@
-# Kconfig.mcux - MCUX GPIO configuration options
-#
+# MCUX GPIO configuration options
+
 # Copyright (c) 2016 Freescale Semiconductor, Inc.
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_MCUX
 	bool "MCUX GPIO driver"
diff --git a/drivers/gpio/Kconfig.mcux_igpio b/drivers/gpio/Kconfig.mcux_igpio
index 9b8b070..147f0f4 100644
--- a/drivers/gpio/Kconfig.mcux_igpio
+++ b/drivers/gpio/Kconfig.mcux_igpio
@@ -1,9 +1,7 @@
-# Kconfig.mcux - MCUX IGPIO configuration options
-#
+# MCUX IGPIO configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_MCUX_IGPIO
 	bool "MCUX IGPIO driver"
diff --git a/drivers/gpio/Kconfig.mcux_lpc b/drivers/gpio/Kconfig.mcux_lpc
index b264158..8d5c29a 100644
--- a/drivers/gpio/Kconfig.mcux_lpc
+++ b/drivers/gpio/Kconfig.mcux_lpc
@@ -1,9 +1,7 @@
-# Kconfig.mcux_lpc - MCUX LPC GPIO configuration options
-#
+# MCUX LPC GPIO configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_MCUX_LPC
 	bool "MCUX LPC GPIO driver"
diff --git a/drivers/gpio/Kconfig.mmio32 b/drivers/gpio/Kconfig.mmio32
index b89ca7b..f488e4c 100644
--- a/drivers/gpio/Kconfig.mmio32
+++ b/drivers/gpio/Kconfig.mmio32
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config GPIO_MMIO32
 	bool
diff --git a/drivers/gpio/Kconfig.nrfx b/drivers/gpio/Kconfig.nrfx
index 83b7805..9d65230 100644
--- a/drivers/gpio/Kconfig.nrfx
+++ b/drivers/gpio/Kconfig.nrfx
@@ -1,7 +1,5 @@
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_NRFX
 	bool "nRF GPIO driver"
diff --git a/drivers/gpio/Kconfig.pcal9535a b/drivers/gpio/Kconfig.pcal9535a
index c823903..7bd50b4 100644
--- a/drivers/gpio/Kconfig.pcal9535a
+++ b/drivers/gpio/Kconfig.pcal9535a
@@ -1,10 +1,7 @@
-# Kconfig.pcal9535a - PCAL9535A GPIO configuration options
-#
-#
+# PCAL9535A GPIO configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_PCAL9535A
 	bool "PCAL9535A I2C-based GPIO chip"
diff --git a/drivers/gpio/Kconfig.rv32m1 b/drivers/gpio/Kconfig.rv32m1
index 9aeab5b..1e7e8b1 100644
--- a/drivers/gpio/Kconfig.rv32m1
+++ b/drivers/gpio/Kconfig.rv32m1
@@ -1,9 +1,7 @@
-# Kconfig.rv32m1 - RV32M1 GPIO configuration options
-#
+# RV32M1 GPIO configuration options
+
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_RV32M1
 	bool "RV32M1 GPIO driver"
diff --git a/drivers/gpio/Kconfig.sam b/drivers/gpio/Kconfig.sam
index 0b5f899..7f450a2 100644
--- a/drivers/gpio/Kconfig.sam
+++ b/drivers/gpio/Kconfig.sam
@@ -1,5 +1,5 @@
-# Kconfig.sam - Atmel SAM GPIO configuration options
-#
+# Atmel SAM GPIO configuration options
+
 # Copyright (c) 2018 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/gpio/Kconfig.sam0 b/drivers/gpio/Kconfig.sam0
index 785920f..b5d4e75 100644
--- a/drivers/gpio/Kconfig.sam0
+++ b/drivers/gpio/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig.sam0 - Atmel SAM0 GPIO configuration options
-#
+# Atmel SAM0 GPIO configuration options
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/gpio/Kconfig.sifive b/drivers/gpio/Kconfig.sifive
index a92421c..e8328b7 100644
--- a/drivers/gpio/Kconfig.sifive
+++ b/drivers/gpio/Kconfig.sifive
@@ -1,9 +1,7 @@
-# Kconfig.fe310 - SiFive Freedom GPIO configuration option
-#
+# SiFive Freedom GPIO configuration option
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_SIFIVE
 	bool "SiFive Freedom Processor GPIO driver"
diff --git a/drivers/gpio/Kconfig.stellaris b/drivers/gpio/Kconfig.stellaris
index 25e41a0..0814058 100644
--- a/drivers/gpio/Kconfig.stellaris
+++ b/drivers/gpio/Kconfig.stellaris
@@ -1,7 +1,6 @@
-# Kconfig.sam - Stellaris
-#
+# Stellaris
+
 # Copyright (c) 2018 Zilogic Systems
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig GPIO_STELLARIS
diff --git a/drivers/gpio/Kconfig.stm32 b/drivers/gpio/Kconfig.stm32
index d82ccae..839fd3a 100644
--- a/drivers/gpio/Kconfig.stm32
+++ b/drivers/gpio/Kconfig.stm32
@@ -1,9 +1,7 @@
-# Kconfig - STM32 GPIO configuration
-#
+# STM32 GPIO configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_STM32
 	bool "GPIO Driver for STM32 family of MCUs"
diff --git a/drivers/gpio/Kconfig.sx1509b b/drivers/gpio/Kconfig.sx1509b
index 6751086..37c4ce5 100644
--- a/drivers/gpio/Kconfig.sx1509b
+++ b/drivers/gpio/Kconfig.sx1509b
@@ -1,10 +1,7 @@
-# Kconfig.sx1509b - SX1509B GPIO configuration options
-#
-#
+# SX1509B GPIO configuration options
+
 # Copyright (c) 2018 Aapo Vienamo
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_SX1509B
 	bool "SX1509B I2C GPIO chip"
diff --git a/drivers/gpio/Kconfig.xec b/drivers/gpio/Kconfig.xec
index 026bae8..6be0678 100644
--- a/drivers/gpio/Kconfig.xec
+++ b/drivers/gpio/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC GPIO configuration options
-#
+# Microchip XEC GPIO configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig GPIO_XEC
 	bool "XEC Microchip GPIO driver"
diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig
index 77b6531..f330c0a 100644
--- a/drivers/hwinfo/Kconfig
+++ b/drivers/hwinfo/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig -HW Info driver configuration options
+# HW Info driver configuration options
 
-#
 # Copyright (c) 2019 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig HWINFO
 	bool "Hardware Information driver"
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 468e683..fec9049 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - I2C configuration options
+# I2C configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # I2C options
diff --git a/drivers/i2c/Kconfig.cc13xx_cc26xx b/drivers/i2c/Kconfig.cc13xx_cc26xx
index e4bb099..76b4ec1 100644
--- a/drivers/i2c/Kconfig.cc13xx_cc26xx
+++ b/drivers/i2c/Kconfig.cc13xx_cc26xx
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_CC13XX_CC26XX
 	bool "TI SimpleLink CC13xx / CC26xx I2C driver"
diff --git a/drivers/i2c/Kconfig.dw b/drivers/i2c/Kconfig.dw
index e39abd1..88241e9 100644
--- a/drivers/i2c/Kconfig.dw
+++ b/drivers/i2c/Kconfig.dw
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # This option signifies whether DesignWare I2C compatible HW is
 # available
diff --git a/drivers/i2c/Kconfig.esp32 b/drivers/i2c/Kconfig.esp32
index d1427c4..6e61930 100644
--- a/drivers/i2c/Kconfig.esp32
+++ b/drivers/i2c/Kconfig.esp32
@@ -1,10 +1,7 @@
-# Kconfig.esp32 - ESP32 I2C configuration options
-#
-#
+# ESP32 I2C configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2C_ESP32
 	bool "ESP32 I2C"
diff --git a/drivers/i2c/Kconfig.gpio b/drivers/i2c/Kconfig.gpio
index fba522c..edc0a64 100644
--- a/drivers/i2c/Kconfig.gpio
+++ b/drivers/i2c/Kconfig.gpio
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_GPIO
 	bool "GPIO bit banging I2C support"
diff --git a/drivers/i2c/Kconfig.nrfx b/drivers/i2c/Kconfig.nrfx
index d98d5cb..99a4096 100644
--- a/drivers/i2c/Kconfig.nrfx
+++ b/drivers/i2c/Kconfig.nrfx
@@ -1,9 +1,7 @@
-# Kconfig - nrfx I2C support
-#
+# nrfx I2C support
+
 # Copyright (c) 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2C_NRFX
 	bool "nRF TWI nrfx drivers"
diff --git a/drivers/i2c/Kconfig.sam0 b/drivers/i2c/Kconfig.sam0
index 6ee4d62..e8362f1 100644
--- a/drivers/i2c/Kconfig.sam0
+++ b/drivers/i2c/Kconfig.sam0
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Derek Hageman <hageman@inthat.cloud>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_SAM0
 
diff --git a/drivers/i2c/Kconfig.sbcon b/drivers/i2c/Kconfig.sbcon
index dc70361..8a849dc 100644
--- a/drivers/i2c/Kconfig.sbcon
+++ b/drivers/i2c/Kconfig.sbcon
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_SBCON
 	bool "I2C driver for ARM's SBCon two-wire serial bus interface"
diff --git a/drivers/i2c/Kconfig.sifive b/drivers/i2c/Kconfig.sifive
index 6e8ccc5..062af74 100644
--- a/drivers/i2c/Kconfig.sifive
+++ b/drivers/i2c/Kconfig.sifive
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 SiFive Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_SIFIVE
 	bool "Sifive I2C driver"
diff --git a/drivers/i2c/Kconfig.stm32 b/drivers/i2c/Kconfig.stm32
index 3265d6d..78ce59f 100644
--- a/drivers/i2c/Kconfig.stm32
+++ b/drivers/i2c/Kconfig.stm32
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2C_STM32
 	bool "STM32 I2C driver"
diff --git a/drivers/i2c/Kconfig.xec b/drivers/i2c/Kconfig.xec
index f864033..91f6763 100644
--- a/drivers/i2c/Kconfig.xec
+++ b/drivers/i2c/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC I2C configuration options
-#
+# Microchip XEC I2C configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2C_XEC
 	bool "XEC Microchip I2C driver"
diff --git a/drivers/i2c/slave/Kconfig b/drivers/i2c/slave/Kconfig
index dab4b8f..6c2aa00 100644
--- a/drivers/i2c/slave/Kconfig
+++ b/drivers/i2c/slave/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - I2C Slave configuration options
+# I2C Slave configuration options
 
-#
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # I2C options
diff --git a/drivers/i2c/slave/Kconfig.eeprom b/drivers/i2c/slave/Kconfig.eeprom
index 25d2a3f..d854c25 100644
--- a/drivers/i2c/slave/Kconfig.eeprom
+++ b/drivers/i2c/slave/Kconfig.eeprom
@@ -1,10 +1,7 @@
-# Kconfig - I2C EEPROM Slave configuration options
+# I2C EEPROM Slave configuration options
 
-#
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_EEPROM_SLAVE
 	bool "I2C Slave EEPROM driver"
diff --git a/drivers/i2s/Kconfig b/drivers/i2s/Kconfig
index af7a01e..2ac1441 100644
--- a/drivers/i2s/Kconfig
+++ b/drivers/i2s/Kconfig
@@ -1,8 +1,7 @@
-# Kconfig - I2S (Inter-IC Sound) driver configuration options
-#
+# I2S (Inter-IC Sound) driver configuration options
+
 # Copyright (c) 2017 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # I2S Drivers
diff --git a/drivers/i2s/Kconfig.cavs b/drivers/i2s/Kconfig.cavs
index 1edad81..6f8eec3 100644
--- a/drivers/i2s/Kconfig.cavs
+++ b/drivers/i2s/Kconfig.cavs
@@ -1,9 +1,7 @@
-# Kconfig - Intel S1000 I2S configuration options
-#
+# Intel S1000 I2S configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2S_CAVS
 	bool "Intel I2S (SSP) Bus Driver"
diff --git a/drivers/i2s/Kconfig.sam_ssc b/drivers/i2s/Kconfig.sam_ssc
index 641f8ec..a02b38a 100644
--- a/drivers/i2s/Kconfig.sam_ssc
+++ b/drivers/i2s/Kconfig.sam_ssc
@@ -1,9 +1,7 @@
-# Kconfig - Atmel SAM I2S bus driver configuration options
-#
+# Atmel SAM I2S bus driver configuration options
+
 # Copyright (c) 2017 Piotr Mienkowski
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2S_SAM_SSC
 	bool "Atmel SAM MCU family I2S (SSC) Bus Driver"
diff --git a/drivers/i2s/Kconfig.stm32 b/drivers/i2s/Kconfig.stm32
index c25abe7..e0de0d5 100644
--- a/drivers/i2s/Kconfig.stm32
+++ b/drivers/i2s/Kconfig.stm32
@@ -1,9 +1,7 @@
-# Kconfig - STM32 I2S driver configuration options
-#
+# STM32 I2S driver configuration options
+
 # Copyright (c) 2018 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig I2S_STM32
 	bool "STM32 MCU I2S controller driver"
diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index a9a5113..bd85eec 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - IEEE 802.15.4 driver configuration options
+# IEEE 802.15.4 driver configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # IEEE 802.15.4 options
diff --git a/drivers/ieee802154/Kconfig.cc1200 b/drivers/ieee802154/Kconfig.cc1200
index e337906..635a165 100644
--- a/drivers/ieee802154/Kconfig.cc1200
+++ b/drivers/ieee802154/Kconfig.cc1200
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI CC1200 configuration options
 
-# Kconfig.cc1200 - TI CC1200 configuration options
-#
+# SPDX-License-Identifier: Apache-2.0
 
 menuconfig IEEE802154_CC1200
 	bool "TI CC1200 Driver support"
diff --git a/drivers/ieee802154/Kconfig.cc13xx_cc26xx b/drivers/ieee802154/Kconfig.cc13xx_cc26xx
index 09fbf65..356a515 100644
--- a/drivers/ieee802154/Kconfig.cc13xx_cc26xx
+++ b/drivers/ieee802154/Kconfig.cc13xx_cc26xx
@@ -1,9 +1,7 @@
-# Kconfig.cc13xx_cc26xx - TI CC13xx / CC26xx IEEE 802.15.4 configuration options
-#
+# TI CC13xx / CC26xx IEEE 802.15.4 configuration options
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig IEEE802154_CC13XX_CC26XX
 	bool "TI CC13xx / CC26xx IEEE 802.15.4 driver support"
diff --git a/drivers/ieee802154/Kconfig.cc2520 b/drivers/ieee802154/Kconfig.cc2520
index a81020a..097d00f 100644
--- a/drivers/ieee802154/Kconfig.cc2520
+++ b/drivers/ieee802154/Kconfig.cc2520
@@ -1,10 +1,7 @@
-# Kconfig.cc2520 - TI CC2520 configuration options
-#
-#
+# TI CC2520 configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig IEEE802154_CC2520
 	bool "TI CC2520 Driver support"
diff --git a/drivers/ieee802154/Kconfig.kw41z b/drivers/ieee802154/Kconfig.kw41z
index e40ddc0..16d3811 100644
--- a/drivers/ieee802154/Kconfig.kw41z
+++ b/drivers/ieee802154/Kconfig.kw41z
@@ -1,10 +1,7 @@
-# Kconfig.kw41z - NXP KW41Z configuration options
-#
-#
+# NXP KW41Z configuration options
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig  IEEE802154_KW41Z
 	bool "NXP KW41Z Driver support"
diff --git a/drivers/ieee802154/Kconfig.mcr20a b/drivers/ieee802154/Kconfig.mcr20a
index 5f53b85..60324aa 100644
--- a/drivers/ieee802154/Kconfig.mcr20a
+++ b/drivers/ieee802154/Kconfig.mcr20a
@@ -1,10 +1,7 @@
-# Kconfig.mcr20a - NXP MCR20A configuration options
-#
-#
+# NXP MCR20A configuration options
+
 # Copyright (c) 2017 PHYTEC Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig  IEEE802154_MCR20A
 	bool "NXP MCR20A Driver support"
diff --git a/drivers/ieee802154/Kconfig.nrf5 b/drivers/ieee802154/Kconfig.nrf5
index cd04431..89be6d6 100644
--- a/drivers/ieee802154/Kconfig.nrf5
+++ b/drivers/ieee802154/Kconfig.nrf5
@@ -1,10 +1,7 @@
-# Kconfig.nrf5 - Nordic Semiconductor nRF5 802.15.4 configuration options
-#
-#
+# Nordic Semiconductor nRF5 802.15.4 configuration options
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig IEEE802154_NRF5
 	bool "nRF52 series IEEE 802.15.4 Driver"
diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig
index 53d7d8c..4155af9 100644
--- a/drivers/interrupt_controller/Kconfig
+++ b/drivers/interrupt_controller/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - interrupt controller configuration options
+# interrupt controller configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Interrupt Controllers"
 
diff --git a/drivers/interrupt_controller/Kconfig.multilevel b/drivers/interrupt_controller/Kconfig.multilevel
index deca2e7..a5be2f2 100644
--- a/drivers/interrupt_controller/Kconfig.multilevel
+++ b/drivers/interrupt_controller/Kconfig.multilevel
@@ -1,10 +1,8 @@
-# Kconfig - Multilevel interrupt configuration
-#
+# Multilevel interrupt configuration
+
 # Copyright (c) 2017 Intel Corporation
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config MULTI_LEVEL_INTERRUPTS
 	bool "Multi-level interrupt support"
diff --git a/drivers/interrupt_controller/Kconfig.rv32m1 b/drivers/interrupt_controller/Kconfig.rv32m1
index 0c6ff17..d0a9497 100644
--- a/drivers/interrupt_controller/Kconfig.rv32m1
+++ b/drivers/interrupt_controller/Kconfig.rv32m1
@@ -1,7 +1,6 @@
-# Kconfig - RV32M1 INTMUX config
-#
+# RV32M1 INTMUX config
+
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config RV32M1_INTMUX
diff --git a/drivers/interrupt_controller/Kconfig.s1000 b/drivers/interrupt_controller/Kconfig.s1000
index 9d40f99..5e7e590 100644
--- a/drivers/interrupt_controller/Kconfig.s1000
+++ b/drivers/interrupt_controller/Kconfig.s1000
@@ -1,9 +1,7 @@
-# Kconfig - Intel_S1000 configuration
-#
+# Intel_S1000 configuration
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config CAVS_ICTL
 	bool "CAVS Interrupt Logic"
diff --git a/drivers/interrupt_controller/Kconfig.sam0 b/drivers/interrupt_controller/Kconfig.sam0
index a281e5b..a51c3f0 100644
--- a/drivers/interrupt_controller/Kconfig.sam0
+++ b/drivers/interrupt_controller/Kconfig.sam0
@@ -1,9 +1,7 @@
-# Kconfig - SAM0 EIC configuration
-#
+# SAM0 EIC configuration
+
 # Copyright (c) 2019 Derek Hageman <hageman@inthat.cloud>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_SAM0
 
diff --git a/drivers/interrupt_controller/Kconfig.shared_irq b/drivers/interrupt_controller/Kconfig.shared_irq
index ba11257..1c8c258 100644
--- a/drivers/interrupt_controller/Kconfig.shared_irq
+++ b/drivers/interrupt_controller/Kconfig.shared_irq
@@ -1,10 +1,7 @@
-# Kconfig - shared_irq configuration options
+# shared_irq configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SHARED_IRQ
 	bool "Shared interrupt driver"
diff --git a/drivers/interrupt_controller/Kconfig.stm32 b/drivers/interrupt_controller/Kconfig.stm32
index 6eb0338..630ee2e 100644
--- a/drivers/interrupt_controller/Kconfig.stm32
+++ b/drivers/interrupt_controller/Kconfig.stm32
@@ -1,9 +1,7 @@
-# Kconfig - STM32 EXTI configuration
-#
+# STM32 EXTI configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_STM32
 
diff --git a/drivers/kscan/Kconfig b/drivers/kscan/Kconfig
index 7822077..2e63103 100644
--- a/drivers/kscan/Kconfig
+++ b/drivers/kscan/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Keyboard scan configuration options
+# Keyboard scan configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig KSCAN
 	bool "Keyboard Scan Drivers"
diff --git a/drivers/kscan/Kconfig.xec b/drivers/kscan/Kconfig.xec
index b59fd74..5214879 100644
--- a/drivers/kscan/Kconfig.xec
+++ b/drivers/kscan/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC Keyboard Scan Matrix configuration options
-#
+# Microchip XEC Keyboard Scan Matrix configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig KSCAN_XEC
 	bool "XEC Microchip KSCAN driver"
diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index aa36482..02a288b 100644
--- a/drivers/led/Kconfig
+++ b/drivers/led/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Top-level configuration file for LED drivers.
 
diff --git a/drivers/led/Kconfig.ht16k33 b/drivers/led/Kconfig.ht16k33
index 0005d43..846583c 100644
--- a/drivers/led/Kconfig.ht16k33
+++ b/drivers/led/Kconfig.ht16k33
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Henrik Brix Andersen <henrik@brixandersen.dk>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig HT16K33
 	bool "HT16K33 LED driver"
diff --git a/drivers/led/Kconfig.lp3943 b/drivers/led/Kconfig.lp3943
index e1e3e67..7aed574 100644
--- a/drivers/led/Kconfig.lp3943
+++ b/drivers/led/Kconfig.lp3943
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config LP3943
 	bool "LP3943 LED driver"
diff --git a/drivers/led/Kconfig.pca9633 b/drivers/led/Kconfig.pca9633
index ce1ea8f..0ca0fe9 100644
--- a/drivers/led/Kconfig.pca9633
+++ b/drivers/led/Kconfig.pca9633
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Savoir-Faire Linux
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PCA9633
 	bool "PCA9633 LED driver"
diff --git a/drivers/led_strip/Kconfig b/drivers/led_strip/Kconfig
index 7e6a1fd..b41ff7d 100644
--- a/drivers/led_strip/Kconfig
+++ b/drivers/led_strip/Kconfig
@@ -1,11 +1,8 @@
-#
+# Top-level configuration file for LED strip drivers.
+
 # Copyright (c) 2017 Linaro Limited
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
-# Top-level configuration file for LED strip drivers.
 
 menuconfig LED_STRIP
 	bool "LED strip drivers"
diff --git a/drivers/led_strip/Kconfig.lpd880x b/drivers/led_strip/Kconfig.lpd880x
index 7b173c3..1e2ba56 100644
--- a/drivers/led_strip/Kconfig.lpd880x
+++ b/drivers/led_strip/Kconfig.lpd880x
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config LPD880X_STRIP
 	bool "Enable LPD880x SPI LED strip driver"
diff --git a/drivers/led_strip/Kconfig.ws2812 b/drivers/led_strip/Kconfig.ws2812
index 6987cff..111db1d 100644
--- a/drivers/led_strip/Kconfig.ws2812
+++ b/drivers/led_strip/Kconfig.ws2812
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # The following blog post is an excellent resource about pulse timing:
 #
diff --git a/drivers/led_strip/Kconfig.ws2812b_sw b/drivers/led_strip/Kconfig.ws2812b_sw
index 847e583..7a0a955 100644
--- a/drivers/led_strip/Kconfig.ws2812b_sw
+++ b/drivers/led_strip/Kconfig.ws2812b_sw
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WS2812B_SW
 	bool "Enable WS2812B software-based LED strip driver"
diff --git a/drivers/modem/Kconfig b/drivers/modem/Kconfig
index 1acd1f8..96de943 100644
--- a/drivers/modem/Kconfig
+++ b/drivers/modem/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Modem configuration options
+# Modem configuration options
 
-#
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MODEM
 	bool "Modem Drivers"
diff --git a/drivers/modem/Kconfig.ublox-sara-r4 b/drivers/modem/Kconfig.ublox-sara-r4
index c724412..8dd67bf 100644
--- a/drivers/modem/Kconfig.ublox-sara-r4
+++ b/drivers/modem/Kconfig.ublox-sara-r4
@@ -1,10 +1,7 @@
-# Kconfig - u-blox SARA R4 driver options
+# u-blox SARA R4 driver options
 
-#
 # Copyright (c) 2019 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config MODEM_UBLOX_SARA
 	bool "Enable u-blox SARA modem driver"
diff --git a/drivers/modem/Kconfig.wncm14a2a b/drivers/modem/Kconfig.wncm14a2a
index f41791e..a85efad 100644
--- a/drivers/modem/Kconfig.wncm14a2a
+++ b/drivers/modem/Kconfig.wncm14a2a
@@ -1,10 +1,7 @@
-# Kconfig - WNCM 14A2A driver options
+# WNCM 14A2A driver options
 
-#
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MODEM_WNCM14A2A
 	bool "Enable Wistron LTE-M modem driver"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef92832..47234fa 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - Misc network drivers configuration options
+# Misc network drivers configuration options
 # SPDX-License-Identifier: Apache-2.0
 
 #
diff --git a/drivers/neural_net/Kconfig b/drivers/neural_net/Kconfig
index 3771120..b6fbd63 100644
--- a/drivers/neural_net/Kconfig
+++ b/drivers/neural_net/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Neural network accelerator driver configuration options
-#
+# Neural network accelerator driver configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NEURAL_NET_ACCEL
 	bool "Neural Network Accelerator Drivers"
diff --git a/drivers/neural_net/Kconfig.intel_gna b/drivers/neural_net/Kconfig.intel_gna
index f6bafc4..7fd856d 100644
--- a/drivers/neural_net/Kconfig.intel_gna
+++ b/drivers/neural_net/Kconfig.intel_gna
@@ -1,9 +1,7 @@
-# Kconfig - Neural network accelerator driver configuration options
-#
+# Neural network accelerator driver configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig INTEL_GNA
 	bool "Intel GNA Inferencing Engine"
diff --git a/drivers/pcie/Kconfig b/drivers/pcie/Kconfig
index 12af0fb..bc9f66f 100644
--- a/drivers/pcie/Kconfig
+++ b/drivers/pcie/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - PCIe/new PCI configuration options
+# PCIe/new PCI configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PCIE
 	bool "Enable new PCI/PCIe support"
diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig
index 7eda371..945e755 100644
--- a/drivers/pinmux/Kconfig
+++ b/drivers/pinmux/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Pinmux configuration options
+# Pinmux configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # PinMux options
diff --git a/drivers/pinmux/Kconfig.beetle b/drivers/pinmux/Kconfig.beetle
index 72c89a7..8f527af 100644
--- a/drivers/pinmux/Kconfig.beetle
+++ b/drivers/pinmux/Kconfig.beetle
@@ -1,10 +1,7 @@
-# Kconfig.beetle - ARM V2M Beetle PINMUX configuration options
-#
-#
+# ARM V2M Beetle PINMUX configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_BEETLE
 	bool "ARM V2M Beetle Pin multiplexer driver"
diff --git a/drivers/pinmux/Kconfig.cc13xx_cc26xx b/drivers/pinmux/Kconfig.cc13xx_cc26xx
index ecf0fd6..39c7605 100644
--- a/drivers/pinmux/Kconfig.cc13xx_cc26xx
+++ b/drivers/pinmux/Kconfig.cc13xx_cc26xx
@@ -1,9 +1,7 @@
-# Kconfig.cc13xx_cc26xx - TI CC13xx / CC26xx PINMUX configuration options
-#
+# TI CC13xx / CC26xx PINMUX configuration options
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_CC13XX_CC26XX
 	bool "TI SimpleLink CC13xx / CC26xx pinmux driver"
diff --git a/drivers/pinmux/Kconfig.cc2650 b/drivers/pinmux/Kconfig.cc2650
index c8d5cd8..2c3e4a8 100644
--- a/drivers/pinmux/Kconfig.cc2650
+++ b/drivers/pinmux/Kconfig.cc2650
@@ -1,6 +1,6 @@
+# TI CC2650 SoC pinmux driver.
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig for TI CC2650 SoC pinmux driver.
 
 config PINMUX_CC2650
 	bool "Pinmux driver for CC2650 SoC"
diff --git a/drivers/pinmux/Kconfig.esp32 b/drivers/pinmux/Kconfig.esp32
index 4f62a80..f2c2f60 100644
--- a/drivers/pinmux/Kconfig.esp32
+++ b/drivers/pinmux/Kconfig.esp32
@@ -1,10 +1,7 @@
-# Kconfig.esp32 - ESP32 Pin mux configuration options
-#
-#
+# ESP32 Pin mux configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_ESP32
 	bool "ESP32 Pin multiplexer driver"
diff --git a/drivers/pinmux/Kconfig.hsdk b/drivers/pinmux/Kconfig.hsdk
index 7f683b1..3176eb8 100644
--- a/drivers/pinmux/Kconfig.hsdk
+++ b/drivers/pinmux/Kconfig.hsdk
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_HSDK
 	bool "ARC HSDK I/O pin mux driver"
diff --git a/drivers/pinmux/Kconfig.intel_s1000 b/drivers/pinmux/Kconfig.intel_s1000
index df28840..e4ca26d 100644
--- a/drivers/pinmux/Kconfig.intel_s1000
+++ b/drivers/pinmux/Kconfig.intel_s1000
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_INTEL_S1000
 	bool "Intel S1000 I/O multiplexer driver"
diff --git a/drivers/pinmux/Kconfig.mcux b/drivers/pinmux/Kconfig.mcux
index 7a719a8..636de0f 100644
--- a/drivers/pinmux/Kconfig.mcux
+++ b/drivers/pinmux/Kconfig.mcux
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK pinmux
-#
+# MCUXpresso SDK pinmux
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PINMUX_MCUX
 	bool "MCUX pinmux driver"
diff --git a/drivers/pinmux/Kconfig.mcux_lpc b/drivers/pinmux/Kconfig.mcux_lpc
index 4d78a9c1..6388027 100644
--- a/drivers/pinmux/Kconfig.mcux_lpc
+++ b/drivers/pinmux/Kconfig.mcux_lpc
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK pinmux for LPC
-#
+# MCUXpresso SDK pinmux for LPC
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PINMUX_MCUX_LPC
 	bool "MCUX LPC pinmux driver"
diff --git a/drivers/pinmux/Kconfig.rv32m1 b/drivers/pinmux/Kconfig.rv32m1
index a618929..4d025d3 100644
--- a/drivers/pinmux/Kconfig.rv32m1
+++ b/drivers/pinmux/Kconfig.rv32m1
@@ -1,9 +1,7 @@
-# Kconfig - RV31M1 SDK pinmux
-#
+# RV31M1 SDK pinmux
+
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PINMUX_RV32M1
 	bool "RV32M1 pinmux driver"
diff --git a/drivers/pinmux/Kconfig.sam0 b/drivers/pinmux/Kconfig.sam0
index e4e7892..aea7295 100644
--- a/drivers/pinmux/Kconfig.sam0
+++ b/drivers/pinmux/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig.sam0 - Atmel SAM0 pinmux configuration options
-#
+# Atmel SAM0 pinmux configuration options
+
 # Copyright (c) 2018 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/pinmux/Kconfig.sifive b/drivers/pinmux/Kconfig.sifive
index af2e4b0..82d09d0 100644
--- a/drivers/pinmux/Kconfig.sifive
+++ b/drivers/pinmux/Kconfig.sifive
@@ -1,9 +1,7 @@
-# Kconfig.fe310 - PINMUX configuration options for SiFive Freedom SOC
-#
+# PINMUX configuration options for SiFive Freedom SOC
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PINMUX_SIFIVE
 	bool "SiFive Freedom SOC pinmux driver"
diff --git a/drivers/pinmux/Kconfig.stm32 b/drivers/pinmux/Kconfig.stm32
index 61125f6..42d6a23 100644
--- a/drivers/pinmux/Kconfig.stm32
+++ b/drivers/pinmux/Kconfig.stm32
@@ -1,9 +1,7 @@
-# Kconfig - configuration for STM32 pinmux
-#
+# Configuration for STM32 pinmux
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PINMUX_STM32
 	bool "Pinmux driver for STM32 MCUs"
diff --git a/drivers/pinmux/Kconfig.xec b/drivers/pinmux/Kconfig.xec
index efb7897..d3d056e 100644
--- a/drivers/pinmux/Kconfig.xec
+++ b/drivers/pinmux/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC pinmux configuration options
-#
+# Microchip XEC pinmux configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PINMUX_XEC
 	bool "XEC Microchip Pinmux driver"
diff --git a/drivers/ps2/Kconfig b/drivers/ps2/Kconfig
index 281721c..eff7b04 100644
--- a/drivers/ps2/Kconfig
+++ b/drivers/ps2/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - PS/2 configuration options
+# PS/2 configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PS2
 	bool "PS/2 Drivers"
diff --git a/drivers/ps2/Kconfig.xec b/drivers/ps2/Kconfig.xec
index e0b7172..732c679 100644
--- a/drivers/ps2/Kconfig.xec
+++ b/drivers/ps2/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig.xec - Microchip XEC PS2 configuration options
-#
+# Microchip XEC PS2 configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PS2_XEC
 	bool "XEC Microchip PS2 driver"
diff --git a/drivers/ptp_clock/Kconfig b/drivers/ptp_clock/Kconfig
index fe3c386..fbbbff1 100644
--- a/drivers/ptp_clock/Kconfig
+++ b/drivers/ptp_clock/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PTP_CLOCK
 	bool "Precision Time Protocol Clock driver support"
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index ecf20e7..b76028b 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - PWM configuration options
+# PWM configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM
 	bool "PWM (Pulse Width Modulation) Drivers"
diff --git a/drivers/pwm/Kconfig.dw b/drivers/pwm/Kconfig.dw
index 2649ba1..47db488 100644
--- a/drivers/pwm/Kconfig.dw
+++ b/drivers/pwm/Kconfig.dw
@@ -1,10 +1,7 @@
-# Kconfig.dw - DesignWare PWM configuration options
-#
-#
+# DesignWare PWM configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_DW
 	bool "DesignWare PWM"
diff --git a/drivers/pwm/Kconfig.esp32 b/drivers/pwm/Kconfig.esp32
index 8958d89..e3af577 100644
--- a/drivers/pwm/Kconfig.esp32
+++ b/drivers/pwm/Kconfig.esp32
@@ -1,10 +1,7 @@
-# Kconfig.esp32 - ESP32 PWM LED configuration options
-#
-#
+# ESP32 PWM LED configuration options
+
 # Copyright (c) 2017 Vitor Massaru Iha <vitor@massaru.org>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_LED_ESP32
 	bool "ESP32 PWM LED driver"
diff --git a/drivers/pwm/Kconfig.imx b/drivers/pwm/Kconfig.imx
index f9b2d49..e61f98e 100644
--- a/drivers/pwm/Kconfig.imx
+++ b/drivers/pwm/Kconfig.imx
@@ -1,9 +1,7 @@
-# Kconfig - i.MX PWM Config
-#
+# i.MX PWM Config
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_IMX
 	bool "i.MX PWM Driver"
diff --git a/drivers/pwm/Kconfig.mcux b/drivers/pwm/Kconfig.mcux
index 1d967ea..cff8e18 100644
--- a/drivers/pwm/Kconfig.mcux
+++ b/drivers/pwm/Kconfig.mcux
@@ -1,10 +1,7 @@
-# Kconfig.stm32 - STM32 PWM configuration options
-#
-#
+# STM32 PWM configuration options
+
 # Copyright (c) 2019 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_MCUX
 	bool "MCUX PWM driver"
diff --git a/drivers/pwm/Kconfig.mcux_ftm b/drivers/pwm/Kconfig.mcux_ftm
index 6368174..91a425c 100644
--- a/drivers/pwm/Kconfig.mcux_ftm
+++ b/drivers/pwm/Kconfig.mcux_ftm
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK FTM PWM
-#
+# MCUXpresso SDK FTM PWM
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PWM_MCUX_FTM
 	bool "MCUX FTM PWM driver"
diff --git a/drivers/pwm/Kconfig.nrf5_sw b/drivers/pwm/Kconfig.nrf5_sw
index 337f74b..b0a5168 100644
--- a/drivers/pwm/Kconfig.nrf5_sw
+++ b/drivers/pwm/Kconfig.nrf5_sw
@@ -1,10 +1,7 @@
-# Kconfig.nrf5_sw - Nordic Semiconductor nRF5x s/w PWM configuration options
-#
-#
+# Nordic Semiconductor nRF5x s/w PWM configuration options
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PWM_NRF5_SW
 	bool "Nordic Semiconductor nRF5x series S/W PWM"
diff --git a/drivers/pwm/Kconfig.nrfx b/drivers/pwm/Kconfig.nrfx
index 05b4a7b..25e0666 100644
--- a/drivers/pwm/Kconfig.nrfx
+++ b/drivers/pwm/Kconfig.nrfx
@@ -1,7 +1,5 @@
 # Copyright (c) 2018, Cue Health Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PWM_NRFX
 	bool "nRF PWM nrfx driver"
diff --git a/drivers/pwm/Kconfig.pca9685 b/drivers/pwm/Kconfig.pca9685
index 367a3f2..096a0b8 100644
--- a/drivers/pwm/Kconfig.pca9685
+++ b/drivers/pwm/Kconfig.pca9685
@@ -1,4 +1,4 @@
-# Kconfig.pca9685 - PCA9685 PWM configuration options
+# PCA9685 PWM configuration options
 #
 #
 # Copyright (c) 2016 Intel Corporation
diff --git a/drivers/pwm/Kconfig.sam b/drivers/pwm/Kconfig.sam
index c2fb89b..7c9a12f 100644
--- a/drivers/pwm/Kconfig.sam
+++ b/drivers/pwm/Kconfig.sam
@@ -1,7 +1,6 @@
-# Kconfig.sam - Atmel SAM TRNG configuration
-#
+# Atmel SAM TRNG configuration
+
 # Copyright (c) 2019 Aurelien Jarno
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config PWM_SAM
diff --git a/drivers/pwm/Kconfig.sifive b/drivers/pwm/Kconfig.sifive
index a0a646a..66a3a69 100644
--- a/drivers/pwm/Kconfig.sifive
+++ b/drivers/pwm/Kconfig.sifive
@@ -1,10 +1,7 @@
-# Kconfig.sifive - SiFive Freedom PWM configuration options
-#
-#
+# SiFive Freedom PWM configuration options
+
 # Copyright (c) 2018 SiFive Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_SIFIVE
 	bool "SiFive Freedom PWM driver"
diff --git a/drivers/pwm/Kconfig.stm32 b/drivers/pwm/Kconfig.stm32
index d93b7af..25bc859 100644
--- a/drivers/pwm/Kconfig.stm32
+++ b/drivers/pwm/Kconfig.stm32
@@ -1,10 +1,7 @@
-# Kconfig.stm32 - STM32 PWM configuration options
-#
-#
+# STM32 PWM configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PWM_STM32
 	bool "STM32 MCU PWM driver"
diff --git a/drivers/pwm/Kconfig.xec b/drivers/pwm/Kconfig.xec
index 1d7a2c8..f54b54d 100644
--- a/drivers/pwm/Kconfig.xec
+++ b/drivers/pwm/Kconfig.xec
@@ -1,10 +1,7 @@
-# Kconfig.xec - Microchip XEC PWM configuration options
-#
-#
+# Microchip XEC PWM configuration options
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config PWM_XEC
 	bool "Microchip XEC PWM"
diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig
index d7e9146..3109df2 100644
--- a/drivers/sensor/Kconfig
+++ b/drivers/sensor/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - sensor configuration options
+# Sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SENSOR
 	bool "Sensor Drivers"
diff --git a/drivers/sensor/adt7420/Kconfig b/drivers/sensor/adt7420/Kconfig
index 280acb5..ff259f6 100644
--- a/drivers/sensor/adt7420/Kconfig
+++ b/drivers/sensor/adt7420/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - ADT7420 temperature sensor configuration options
-#
+# ADT7420 temperature sensor configuration options
+
 # Copyright (c) 2018 Analog Devices Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ADT7420
 	bool "ADT7420 Temperature Sensor"
diff --git a/drivers/sensor/adxl362/Kconfig b/drivers/sensor/adxl362/Kconfig
index d2a0469..9bd63a7 100644
--- a/drivers/sensor/adxl362/Kconfig
+++ b/drivers/sensor/adxl362/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig.adxl362 - ADXL362 Three-Axis Digital Accelerometers
+# ADXL362 Three-Axis Digital Accelerometers
 
-#
 # Copyright (c) 2017 IpTronix S.r.l.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig ADXL362
 	bool "ADXL362 sensor"
 	depends on SPI
diff --git a/drivers/sensor/adxl372/Kconfig b/drivers/sensor/adxl372/Kconfig
index b335cab..397d860 100644
--- a/drivers/sensor/adxl372/Kconfig
+++ b/drivers/sensor/adxl372/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Micropower, 3-Axis, +/-200g Digital Accelerometer
-#
+# Micropower, 3-Axis, +/-200g Digital Accelerometer
+
 # Copyright (c) 2018 Analog Devices Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ADXL372
 	bool "ADXL372 Three Axis High-g I2C/SPI accelerometer"
diff --git a/drivers/sensor/ak8975/Kconfig b/drivers/sensor/ak8975/Kconfig
index 7234f88..d8acc05 100644
--- a/drivers/sensor/ak8975/Kconfig
+++ b/drivers/sensor/ak8975/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - AK8975 magnetometer configuration options
+# AK8975 magnetometer configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig AK8975
 	bool "AK8975 Magnetometer"
diff --git a/drivers/sensor/amg88xx/Kconfig b/drivers/sensor/amg88xx/Kconfig
index 67b78e1..e77d9f9 100644
--- a/drivers/sensor/amg88xx/Kconfig
+++ b/drivers/sensor/amg88xx/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - AMG88XX infrared thermopile sensor configuration options
+# AMG88XX infrared thermopile sensor configuration options
 
-#
 # Copyright (c) 2017 Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig AMG88XX
 	bool "AMG88XX Infrared Thermopile Sensor"
diff --git a/drivers/sensor/ams_iAQcore/Kconfig b/drivers/sensor/ams_iAQcore/Kconfig
index a28652a..dc82734 100644
--- a/drivers/sensor/ams_iAQcore/Kconfig
+++ b/drivers/sensor/ams_iAQcore/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - iAQ-core Digital VOC sensor configuration options
+# iAQ-core Digital VOC sensor configuration options
 
-#
 # Copyright (c) 2018 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig AMS_IAQ_CORE
 	bool "iAQ-core Digital VOC sensor"
diff --git a/drivers/sensor/apds9960/Kconfig b/drivers/sensor/apds9960/Kconfig
index accfc07..1cb52c3 100644
--- a/drivers/sensor/apds9960/Kconfig
+++ b/drivers/sensor/apds9960/Kconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2017 Intel Corporation
 # Copyright (c) 2018 Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig APDS9960
 	bool "APDS9960 Sensor"
diff --git a/drivers/sensor/bma280/Kconfig b/drivers/sensor/bma280/Kconfig
index 3ea4e42..1cedf10 100644
--- a/drivers/sensor/bma280/Kconfig
+++ b/drivers/sensor/bma280/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - BMA280 Three Axis Accelerometer configuration options
+# BMA280 Three Axis Accelerometer configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BMA280
 	bool "BMA280 Three Axis Accelerometer Family"
diff --git a/drivers/sensor/bmc150_magn/Kconfig b/drivers/sensor/bmc150_magn/Kconfig
index fc50ed8..2a863f3 100644
--- a/drivers/sensor/bmc150_magn/Kconfig
+++ b/drivers/sensor/bmc150_magn/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - BMC150 magnetometer sensor configuration options
+# BMC150 magnetometer sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BMC150_MAGN
 	bool "BMC150_MAGN I2C Magnetometer Chip"
diff --git a/drivers/sensor/bme280/Kconfig b/drivers/sensor/bme280/Kconfig
index cd83842..6a79157 100644
--- a/drivers/sensor/bme280/Kconfig
+++ b/drivers/sensor/bme280/Kconfig
@@ -1,11 +1,9 @@
-# Kconfig.bmp280 - BMP280 temperature and pressure sensor configuration options
+# BMP280 temperature and pressure sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
 # Copyright (c) 2017 IpTronix S.r.l.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig BME280
 	bool "BME280/BMP280 sensor"
 	depends on I2C || SPI
diff --git a/drivers/sensor/bme680/Kconfig b/drivers/sensor/bme680/Kconfig
index bc489b1..9198f16 100644
--- a/drivers/sensor/bme680/Kconfig
+++ b/drivers/sensor/bme680/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig.bme680 - BME680 temperature, pressure, humidity and gas sensor configuration options
+# BME680 temperature, pressure, humidity and gas sensor configuration options
 
-#
 # Copyright (c) 2018 Bosch Sensortec GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig BME680
 	bool "BME680 sensor"
 	depends on I2C
diff --git a/drivers/sensor/bmg160/Kconfig b/drivers/sensor/bmg160/Kconfig
index 94a20c2..51421bd 100644
--- a/drivers/sensor/bmg160/Kconfig
+++ b/drivers/sensor/bmg160/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Bosch BMG160 gyroscope configuration options
+# Bosch BMG160 gyroscope configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BMG160
 	bool "Bosch BMG160 gyroscope support"
diff --git a/drivers/sensor/bmi160/Kconfig b/drivers/sensor/bmi160/Kconfig
index 4cb381f..acc7609 100644
--- a/drivers/sensor/bmi160/Kconfig
+++ b/drivers/sensor/bmi160/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Bosch BMI160 inertial measurement configuration options
+# Bosch BMI160 inertial measurement configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BMI160
 	bool "Bosch BMI160 inertial measurement unit"
diff --git a/drivers/sensor/bmm150/Kconfig b/drivers/sensor/bmm150/Kconfig
index 45af41d..ce18c3e 100644
--- a/drivers/sensor/bmm150/Kconfig
+++ b/drivers/sensor/bmm150/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - BMM150 Geomagnetic sensor configuration options
+# BMM150 Geomagnetic sensor configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BMM150
 	bool "BMM150 I2C Geomagnetic Chip"
diff --git a/drivers/sensor/ccs811/Kconfig b/drivers/sensor/ccs811/Kconfig
index bf028c7..9f0bd6b 100644
--- a/drivers/sensor/ccs811/Kconfig
+++ b/drivers/sensor/ccs811/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - CCS811 Digital Gas sensor configuration options
+# CCS811 Digital Gas sensor configuration options
 
-#
 # Copyright (c) 2018 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig CCS811
 	bool "CCS811 Digital Gas Sensor"
diff --git a/drivers/sensor/dht/Kconfig b/drivers/sensor/dht/Kconfig
index e7d828a..98370b7 100644
--- a/drivers/sensor/dht/Kconfig
+++ b/drivers/sensor/dht/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - DHT Temperature and Himidity Sensor configuration options
+# DHT Temperature and Himidity Sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig DHT
 	bool "DHT Temperature and Humidity Sensor"
diff --git a/drivers/sensor/ens210/Kconfig b/drivers/sensor/ens210/Kconfig
index 3c8b66e..fa02e15 100644
--- a/drivers/sensor/ens210/Kconfig
+++ b/drivers/sensor/ens210/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - ENS210 Digital Temperature and Humidity sensor configuration options
+# ENS210 Digital Temperature and Humidity sensor configuration options
 
-#
 # Copyright (c) 2018 Alexander Wachter.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ENS210
 	bool "ENS210 Digital Temperature and Humidity sensor"
diff --git a/drivers/sensor/fxas21002/Kconfig b/drivers/sensor/fxas21002/Kconfig
index 8b0ff10..ff51a4f 100644
--- a/drivers/sensor/fxas21002/Kconfig
+++ b/drivers/sensor/fxas21002/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - FXAS21002 3-axis gyroscope
-#
+# FXAS21002 3-axis gyroscope
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig FXAS21002
 	bool "FXAS21002 gyroscope driver"
diff --git a/drivers/sensor/fxos8700/Kconfig b/drivers/sensor/fxos8700/Kconfig
index 0d2cfe0..495efed 100644
--- a/drivers/sensor/fxos8700/Kconfig
+++ b/drivers/sensor/fxos8700/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - FXOS8700 6-axis accelerometer/magnetometer
-#
+# FXOS8700 6-axis accelerometer/magnetometer
+
 # Copyright (c) 2016 Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig FXOS8700
 	bool "FXOS8700 accelerometer/magnetometer driver"
diff --git a/drivers/sensor/grove/Kconfig b/drivers/sensor/grove/Kconfig
index 3c9c3ac..13d3116 100644
--- a/drivers/sensor/grove/Kconfig
+++ b/drivers/sensor/grove/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - drivers configuration options for SeeedStudio Grove Devices
+# Drivers configuration options for SeeedStudio Grove Devices
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config GROVE_LIGHT_SENSOR
 	bool "Enable the Seeed Grove Light Sensor"
diff --git a/drivers/sensor/hmc5883l/Kconfig b/drivers/sensor/hmc5883l/Kconfig
index 253e4a4..227e520 100644
--- a/drivers/sensor/hmc5883l/Kconfig
+++ b/drivers/sensor/hmc5883l/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig HMC5883L
 	bool "HMC5883L magnetometer"
diff --git a/drivers/sensor/hp206c/Kconfig b/drivers/sensor/hp206c/Kconfig
index 33516dc..77e2f16 100644
--- a/drivers/sensor/hp206c/Kconfig
+++ b/drivers/sensor/hp206c/Kconfig
@@ -1,10 +1,9 @@
-# Kconfig - HopeRF Electronic HP206C precision barometer and
-#                  altimeter configuration options
-#
+# HopeRF Electronic HP206C precision barometer and altimeter configuration
+# options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig HP206C
 	bool "HopeRF HP206C precision barometer and altimeter sensor"
 	depends on I2C
diff --git a/drivers/sensor/hts221/Kconfig b/drivers/sensor/hts221/Kconfig
index 418ec48..10f38af 100644
--- a/drivers/sensor/hts221/Kconfig
+++ b/drivers/sensor/hts221/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig HTS221
 	bool "HTS221 temperature and humidity sensor"
diff --git a/drivers/sensor/iis3dhhc/Kconfig b/drivers/sensor/iis3dhhc/Kconfig
index 54931d2..4c285ec 100644
--- a/drivers/sensor/iis3dhhc/Kconfig
+++ b/drivers/sensor/iis3dhhc/Kconfig
@@ -1,9 +1,7 @@
 # ST Microelectronics IIS3DHHC accelerometer sensor
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig IIS3DHHC
 	bool "IIS3DHHC accelerometer sensor"
diff --git a/drivers/sensor/isl29035/Kconfig b/drivers/sensor/isl29035/Kconfig
index bb42467..c466e7f 100644
--- a/drivers/sensor/isl29035/Kconfig
+++ b/drivers/sensor/isl29035/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - ISL29035 light sensor configuration options
+# ISL29035 light sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig ISL29035
 	bool "ISL29035 light sensor"
diff --git a/drivers/sensor/lis2dh/Kconfig b/drivers/sensor/lis2dh/Kconfig
index fb048ff..cd2a699 100644
--- a/drivers/sensor/lis2dh/Kconfig
+++ b/drivers/sensor/lis2dh/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - LIS2DH Three Axis Accelerometer configuration options
+# LIS2DH Three Axis Accelerometer configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIS2DH
 	bool "LIS2DH Three Axis Accelerometer"
diff --git a/drivers/sensor/lis2ds12/Kconfig b/drivers/sensor/lis2ds12/Kconfig
index 087a9ed..7ce1cea 100644
--- a/drivers/sensor/lis2ds12/Kconfig
+++ b/drivers/sensor/lis2ds12/Kconfig
@@ -1,9 +1,7 @@
 # ST Microelectronics LIS2DS12 3-axis accelerometer driver
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIS2DS12
 	bool "LIS2DS12 I2C/SPI accelerometer sensor driver"
diff --git a/drivers/sensor/lis2dw12/Kconfig b/drivers/sensor/lis2dw12/Kconfig
index 2a76115..145a875 100644
--- a/drivers/sensor/lis2dw12/Kconfig
+++ b/drivers/sensor/lis2dw12/Kconfig
@@ -1,9 +1,7 @@
 # ST Microelectronics LIS2DW12 3-axis accelerometer driver
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIS2DW12
 	bool "LIS2DW12 I2C/SPI accelerometer sensor driver"
diff --git a/drivers/sensor/lis2mdl/Kconfig b/drivers/sensor/lis2mdl/Kconfig
index 2731026..7b8ebc4 100644
--- a/drivers/sensor/lis2mdl/Kconfig
+++ b/drivers/sensor/lis2mdl/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2018-2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIS2MDL
 	bool "LIS2MDL Magnetometer"
diff --git a/drivers/sensor/lis3mdl/Kconfig b/drivers/sensor/lis3mdl/Kconfig
index 9f71b8e..4f55d71 100644
--- a/drivers/sensor/lis3mdl/Kconfig
+++ b/drivers/sensor/lis3mdl/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LIS3MDL
 	bool "LIS3MDL magnetometer"
diff --git a/drivers/sensor/lps22hb/Kconfig b/drivers/sensor/lps22hb/Kconfig
index 05933c7..9f9c042 100644
--- a/drivers/sensor/lps22hb/Kconfig
+++ b/drivers/sensor/lps22hb/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LPS22HB
 	bool "LPS22HB pressure and temperature"
diff --git a/drivers/sensor/lps22hh/Kconfig b/drivers/sensor/lps22hh/Kconfig
index a3ace82..9bac210 100644
--- a/drivers/sensor/lps22hh/Kconfig
+++ b/drivers/sensor/lps22hh/Kconfig
@@ -1,9 +1,7 @@
 # ST Microelectronics LPS22HH pressure and temperature sensor
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LPS22HH
 	bool "LPS22HH pressure and temperature"
diff --git a/drivers/sensor/lps25hb/Kconfig b/drivers/sensor/lps25hb/Kconfig
index 38347e3..9b07d46 100644
--- a/drivers/sensor/lps25hb/Kconfig
+++ b/drivers/sensor/lps25hb/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LPS25HB
 	bool "LPS25HB pressure and temperature"
diff --git a/drivers/sensor/lsm303dlhc_magn/Kconfig b/drivers/sensor/lsm303dlhc_magn/Kconfig
index a334679..af88f14 100644
--- a/drivers/sensor/lsm303dlhc_magn/Kconfig
+++ b/drivers/sensor/lsm303dlhc_magn/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - LSM303DLHC Three Axis Magnetometer configuration options
+# LSM303DLHC Three Axis Magnetometer configuration options
 
-#
 # Copyright (c) 2018 Philémon Jaermann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LSM303DLHC_MAGN
 	bool "LSM303DLHC Three Axis Magnetometer"
diff --git a/drivers/sensor/lsm6ds0/Kconfig b/drivers/sensor/lsm6ds0/Kconfig
index 833a33b..b6e4c2e 100644
--- a/drivers/sensor/lsm6ds0/Kconfig
+++ b/drivers/sensor/lsm6ds0/Kconfig
@@ -1,11 +1,8 @@
-# Kconfig - LSM6DS0 accelerometer and gyroscope sensor configuration
+# LSM6DS0 accelerometer and gyroscope sensor configuration
 # options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LSM6DS0
 	bool "LSM6DS0 I2C accelerometer and gyroscope Chip"
diff --git a/drivers/sensor/lsm6dsl/Kconfig b/drivers/sensor/lsm6dsl/Kconfig
index 2a533cd..9c70861 100644
--- a/drivers/sensor/lsm6dsl/Kconfig
+++ b/drivers/sensor/lsm6dsl/Kconfig
@@ -1,11 +1,8 @@
-# Kconfig - LSM6DSL accelerometer and gyroscope sensor configuration
+# LSM6DSL accelerometer and gyroscope sensor configuration
 # options
 
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LSM6DSL
 	bool "LSM6DSL I2C/SPI accelerometer and gyroscope Chip"
diff --git a/drivers/sensor/lsm6dso/Kconfig b/drivers/sensor/lsm6dso/Kconfig
index 4a7fe55..90d2eff 100644
--- a/drivers/sensor/lsm6dso/Kconfig
+++ b/drivers/sensor/lsm6dso/Kconfig
@@ -1,9 +1,8 @@
 # ST Microelectronics LSM6DSO 6-axis IMU sensor driver
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig LSM6DSO
 	bool "LSM6DSO I2C/SPI accelerometer and gyroscope Chip"
 	depends on (I2C && HAS_DTS_I2C) || SPI
diff --git a/drivers/sensor/lsm9ds0_gyro/Kconfig b/drivers/sensor/lsm9ds0_gyro/Kconfig
index a00680c..585dc18 100644
--- a/drivers/sensor/lsm9ds0_gyro/Kconfig
+++ b/drivers/sensor/lsm9ds0_gyro/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - LSM9DS0 gyroscope sensor configuration options
+# LSM9DS0 gyroscope sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LSM9DS0_GYRO
 	bool "LSM9DS0 I2C gyroscope Chip"
diff --git a/drivers/sensor/lsm9ds0_mfd/Kconfig b/drivers/sensor/lsm9ds0_mfd/Kconfig
index 3f99e82..85da7ac 100644
--- a/drivers/sensor/lsm9ds0_mfd/Kconfig
+++ b/drivers/sensor/lsm9ds0_mfd/Kconfig
@@ -1,11 +1,7 @@
-# Kconfig - LSM9DS0 accelerometer, magnetometer and temperature
-# configuration options
+# LSM9DS0 accelerometer, magnetometer and temperature configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LSM9DS0_MFD
 	bool "LSM9DS0 I2C accelerometer, magnetometer and temperature sensor chip"
diff --git a/drivers/sensor/max30101/Kconfig b/drivers/sensor/max30101/Kconfig
index 233f8e2..ca551ee 100644
--- a/drivers/sensor/max30101/Kconfig
+++ b/drivers/sensor/max30101/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - MAX30101 heart rate sensor
-#
+# MAX30101 heart rate sensor
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MAX30101
 	bool "MAX30101 Pulse Oximeter and Heart Rate Sensor"
diff --git a/drivers/sensor/max44009/Kconfig b/drivers/sensor/max44009/Kconfig
index 8f8d91b..9721e17 100644
--- a/drivers/sensor/max44009/Kconfig
+++ b/drivers/sensor/max44009/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - MAX44009 light sensor configuration options
+# MAX44009 light sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MAX44009
 	bool "MAX44009 Light Sensor"
diff --git a/drivers/sensor/mcp9808/Kconfig b/drivers/sensor/mcp9808/Kconfig
index 40935de..feef7ff 100644
--- a/drivers/sensor/mcp9808/Kconfig
+++ b/drivers/sensor/mcp9808/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - MCP9808 temperature sensor configuration options
+# MCP9808 temperature sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MCP9808
 	bool "MCP9808 temperature sensor"
diff --git a/drivers/sensor/mpu6050/Kconfig b/drivers/sensor/mpu6050/Kconfig
index 58eefb0..b2d3682 100644
--- a/drivers/sensor/mpu6050/Kconfig
+++ b/drivers/sensor/mpu6050/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - MPU6050 Six-Axis Motion Tracking device configuration options
+# MPU6050 Six-Axis Motion Tracking device configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig MPU6050
 	bool "MPU6050 Six-Axis Motion Tracking Device"
diff --git a/drivers/sensor/ms5837/Kconfig b/drivers/sensor/ms5837/Kconfig
index 117b3ca..990374b 100644
--- a/drivers/sensor/ms5837/Kconfig
+++ b/drivers/sensor/ms5837/Kconfig
@@ -1,11 +1,8 @@
 # MS5837 pressure sensor configuration options
 
-#
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config MS5837
 	bool "MS5837 pressure and temperature sensor"
 	depends on I2C && HAS_DTS_I2C
diff --git a/drivers/sensor/nrf5/Kconfig b/drivers/sensor/nrf5/Kconfig
index 00edf1a..60e9c40 100644
--- a/drivers/sensor/nrf5/Kconfig
+++ b/drivers/sensor/nrf5/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - nRF5 temperature sensor configuration options
+# nRF5 temperature sensor configuration options
 
-#
 # Copyright (c) 2016 ARM Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig TEMP_NRF5
 	bool "nRF5 Temperature Sensor"
diff --git a/drivers/sensor/opt3001/Kconfig b/drivers/sensor/opt3001/Kconfig
index 1a7a2b5..a508bf5 100644
--- a/drivers/sensor/opt3001/Kconfig
+++ b/drivers/sensor/opt3001/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - OPT3001 light sensor configuration options
-#
+# OPT3001 light sensor configuration options
+
 # Copyright (c) 2019 Actinius
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config OPT3001
 	bool "OPT3001 Light Sensor"
diff --git a/drivers/sensor/pms7003/Kconfig b/drivers/sensor/pms7003/Kconfig
index 08e50d2..fdfd3c8 100644
--- a/drivers/sensor/pms7003/Kconfig
+++ b/drivers/sensor/pms7003/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - PMS7003 particulate matter sensor configuration options
+# PMS7003 particulate matter sensor configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig PMS7003
 	bool "PMS7003 particulate matter sensor"
diff --git a/drivers/sensor/qdec_nrfx/Kconfig b/drivers/sensor/qdec_nrfx/Kconfig
index 2236e56..92e40a9 100644
--- a/drivers/sensor/qdec_nrfx/Kconfig
+++ b/drivers/sensor/qdec_nrfx/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config QDEC_NRFX
 	bool "Nordic QDEC nrfx driver"
diff --git a/drivers/sensor/sht3xd/Kconfig b/drivers/sensor/sht3xd/Kconfig
index 6b9771c..e0697e8 100644
--- a/drivers/sensor/sht3xd/Kconfig
+++ b/drivers/sensor/sht3xd/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - SHT3xD temperature and humidity sensor configuration options
+# SHT3xD temperature and humidity sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SHT3XD
 	bool "SHT3xD Temperature and Humidity Sensor"
diff --git a/drivers/sensor/si7006/Kconfig b/drivers/sensor/si7006/Kconfig
index 818a924..9b28bfa 100644
--- a/drivers/sensor/si7006/Kconfig
+++ b/drivers/sensor/si7006/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Electronut Labs
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SI7006
 	bool "Si7006 Temperature and Humidity Sensor"
diff --git a/drivers/sensor/si7060/Kconfig b/drivers/sensor/si7060/Kconfig
index 4f0b62b..3efa6b2 100644
--- a/drivers/sensor/si7060/Kconfig
+++ b/drivers/sensor/si7060/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - SI7060 temperature sensor configuration options #
-#
+# SI7060 temperature sensor configuration options
+
 # Copyright (c) 2019 Actinius
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SI7060
 	bool "SI7060 Temperature Sensor"
diff --git a/drivers/sensor/stts751/Kconfig b/drivers/sensor/stts751/Kconfig
index febe7c9..0762de7 100644
--- a/drivers/sensor/stts751/Kconfig
+++ b/drivers/sensor/stts751/Kconfig
@@ -1,9 +1,7 @@
 # ST Microelectronics STTS751 temperature sensor
-#
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig STTS751
 	bool "STTS751 temperature sensor"
diff --git a/drivers/sensor/sx9500/Kconfig b/drivers/sensor/sx9500/Kconfig
index 8c84c3a..7b5dc9f 100644
--- a/drivers/sensor/sx9500/Kconfig
+++ b/drivers/sensor/sx9500/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - SX9500 SAR proximity sensor configuration options
+# SX9500 SAR proximity sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SX9500
 	bool "SX9500 I2C SAR Proximity Chip"
diff --git a/drivers/sensor/th02/Kconfig b/drivers/sensor/th02/Kconfig
index b963359..69c96a8 100644
--- a/drivers/sensor/th02/Kconfig
+++ b/drivers/sensor/th02/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig TH02
 	bool "TH02 Temperature Sensor"
diff --git a/drivers/sensor/ti_hdc/Kconfig b/drivers/sensor/ti_hdc/Kconfig
index 5fb57c4..3b7744d 100644
--- a/drivers/sensor/ti_hdc/Kconfig
+++ b/drivers/sensor/ti_hdc/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - TI_HDC temperature and humidity sensor configuration options
+# TI_HDC temperature and humidity sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config TI_HDC
 	bool "Texas Instruments Temperature and Humidity Sensor (e.g. HDC1008)"
diff --git a/drivers/sensor/tmp007/Kconfig b/drivers/sensor/tmp007/Kconfig
index 4e0f36b..a0a6e9d 100644
--- a/drivers/sensor/tmp007/Kconfig
+++ b/drivers/sensor/tmp007/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - TMP007 infrared thermopile sensor configuration options
+# TMP007 infrared thermopile sensor configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig TMP007
 	bool "TMP007 Infrared Thermopile Sensor"
diff --git a/drivers/sensor/tmp112/Kconfig b/drivers/sensor/tmp112/Kconfig
index 5fb0ab3..9db9bff 100644
--- a/drivers/sensor/tmp112/Kconfig
+++ b/drivers/sensor/tmp112/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - TMP112 temperature sensor configuration options
+# TMP112 temperature sensor configuration options
 
-#
 # Copyright (c) 2016 Firmwave
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig TMP112
 	bool "TMP112 Temperature Sensor"
diff --git a/drivers/sensor/tmp116/Kconfig b/drivers/sensor/tmp116/Kconfig
index 4dd847e..a90e067 100644
--- a/drivers/sensor/tmp116/Kconfig
+++ b/drivers/sensor/tmp116/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - TMP116 temperature sensor configuration options
+# TMP116 temperature sensor configuration options
 
-#
 # Copyright (c) 2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config TMP116
 	bool "TMP116 Temperature Sensor"
diff --git a/drivers/sensor/vl53l0x/Kconfig b/drivers/sensor/vl53l0x/Kconfig
index 374df54..2b09384 100644
--- a/drivers/sensor/vl53l0x/Kconfig
+++ b/drivers/sensor/vl53l0x/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - VL53L0X time of flight sensor configuration options
+# VL53L0X time of flight sensor configuration options
 
-#
 # Copyright (c) 2017 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig VL53L0X
 	bool "VL53L0X time of flight sensor"
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index f81a823..591e724 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - serial driver configuration options
+# Serial driver configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SERIAL
 	bool "Serial Drivers"
diff --git a/drivers/serial/Kconfig.cc13xx_cc26xx b/drivers/serial/Kconfig.cc13xx_cc26xx
index 40c5cae..2119f36 100644
--- a/drivers/serial/Kconfig.cc13xx_cc26xx
+++ b/drivers/serial/Kconfig.cc13xx_cc26xx
@@ -1,9 +1,7 @@
-# Kconfig.cc13xx_cc26xx - TI CC13xx / CC26xx UART configuration options
-#
+# TI CC13xx / CC26xx UART configuration options
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_CC13XX_CC26XX
 	bool "TI SimpleLink CC13xx / CC26xx UART driver"
diff --git a/drivers/serial/Kconfig.cmsdk_apb b/drivers/serial/Kconfig.cmsdk_apb
index 313b776..f93c848 100644
--- a/drivers/serial/Kconfig.cmsdk_apb
+++ b/drivers/serial/Kconfig.cmsdk_apb
@@ -1,10 +1,7 @@
-# Kconfig.beetle - ARM CMSDK APB SoC UART configuration options
-#
-#
+# ARM CMSDK APB SoC UART configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config UART_CMSDK_APB
 	bool "ARM CMSDK APB UART driver"
diff --git a/drivers/serial/Kconfig.gecko b/drivers/serial/Kconfig.gecko
index da7fcba..7e4e3dc 100644
--- a/drivers/serial/Kconfig.gecko
+++ b/drivers/serial/Kconfig.gecko
@@ -1,9 +1,7 @@
-# Kconfig - Gecko SDK UART
-#
+# Gecko SDK UART
+
 # Copyright (c) 2017, Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config UART_GECKO
 	bool "Gecko UART/USART driver"
diff --git a/drivers/serial/Kconfig.imx b/drivers/serial/Kconfig.imx
index e188e60..49e4e1c 100644
--- a/drivers/serial/Kconfig.imx
+++ b/drivers/serial/Kconfig.imx
@@ -1,10 +1,7 @@
-# Kconfig - iMX7 M4 UART
-#
-# Copyright (c) 2018, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# iMX7 M4 UART
 
+# Copyright (c) 2018, NXP
+# SPDX-License-Identifier: Apache-2.0
 
 menuconfig UART_IMX
 	bool "NXP i.MX7 family processor UART driver"
diff --git a/drivers/serial/Kconfig.leuart_gecko b/drivers/serial/Kconfig.leuart_gecko
index 39aa5da..0d5142e 100644
--- a/drivers/serial/Kconfig.leuart_gecko
+++ b/drivers/serial/Kconfig.leuart_gecko
@@ -1,9 +1,7 @@
-# Kconfig - Gecko SDK LEUART
-#
+# Gecko SDK LEUART
+
 # Copyright (c) 2018, Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config LEUART_GECKO
 	bool "Gecko leuart driver"
diff --git a/drivers/serial/Kconfig.litex b/drivers/serial/Kconfig.litex
index 64f28e9..15ae294 100644
--- a/drivers/serial/Kconfig.litex
+++ b/drivers/serial/Kconfig.litex
@@ -1,9 +1,7 @@
-# Kconfig.litex - LiteX UART (LiteUART) configuration option
-#
+# LiteX UART (LiteUART) configuration option
+
 # Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config UART_LITEUART
 	bool "LiteUART serial driver"
diff --git a/drivers/serial/Kconfig.mcux b/drivers/serial/Kconfig.mcux
index 5590670..c5bd45a 100644
--- a/drivers/serial/Kconfig.mcux
+++ b/drivers/serial/Kconfig.mcux
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK UART
-#
+# MCUXpresso SDK UART
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_MCUX
 	bool "MCUX uart driver"
diff --git a/drivers/serial/Kconfig.mcux_lpc_usart b/drivers/serial/Kconfig.mcux_lpc_usart
index 5bd7b86..f5adeb5 100644
--- a/drivers/serial/Kconfig.mcux_lpc_usart
+++ b/drivers/serial/Kconfig.mcux_lpc_usart
@@ -1,7 +1,6 @@
-# Kconfig - MCUXpresso SDK USART
-#
+# MCUXpresso SDK USART
+
 # Copyright 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig USART_MCUX_LPC
diff --git a/drivers/serial/Kconfig.mcux_lpsci b/drivers/serial/Kconfig.mcux_lpsci
index 48dce99..601fcbd 100644
--- a/drivers/serial/Kconfig.mcux_lpsci
+++ b/drivers/serial/Kconfig.mcux_lpsci
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK LPSCI
-#
+# MCUXpresso SDK LPSCI
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_MCUX_LPSCI
 	bool "MCUX LPSCI driver"
diff --git a/drivers/serial/Kconfig.mcux_lpuart b/drivers/serial/Kconfig.mcux_lpuart
index 30520cc..247fbff 100644
--- a/drivers/serial/Kconfig.mcux_lpuart
+++ b/drivers/serial/Kconfig.mcux_lpuart
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK LPUART
-#
+# MCUXpresso SDK LPUART
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_MCUX_LPUART
 	bool "MCUX LPUART driver"
diff --git a/drivers/serial/Kconfig.miv b/drivers/serial/Kconfig.miv
index 345e4a6..f777b82 100644
--- a/drivers/serial/Kconfig.miv
+++ b/drivers/serial/Kconfig.miv
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
+# Mi-V UART configuration option
 
-# Kconfig.miv - Mi-V UART configuration option
-#
 # Copyright (c) 2018 Antmicro <www.antmicro.com>
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config UART_MIV
 	bool "Mi-V serial driver"
diff --git a/drivers/serial/Kconfig.nrfx b/drivers/serial/Kconfig.nrfx
index ffc7575..b353427 100644
--- a/drivers/serial/Kconfig.nrfx
+++ b/drivers/serial/Kconfig.nrfx
@@ -1,9 +1,7 @@
-# Kconfig.nrfx - nrfx UART configuration
-#
+# nrfx UART configuration
+
 # Copyright (c) 2016 - 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_NRFX
 	bool "nRF UART nrfx drivers"
diff --git a/drivers/serial/Kconfig.pl011 b/drivers/serial/Kconfig.pl011
index aed410b..7ad54a4 100644
--- a/drivers/serial/Kconfig.pl011
+++ b/drivers/serial/Kconfig.pl011
@@ -1,9 +1,5 @@
-# Kconfig.pl011
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_PL011
 	bool "ARM PL011 UART Driver"
diff --git a/drivers/serial/Kconfig.psoc6 b/drivers/serial/Kconfig.psoc6
index 2d4340a..366c0be 100644
--- a/drivers/serial/Kconfig.psoc6
+++ b/drivers/serial/Kconfig.psoc6
@@ -1,9 +1,7 @@
-# Kconfig - Cypress UART configuration
-#
+# Cypress UART configuration
+
 # Copyright (c) 2018 Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_PSOC6
 	bool "PSoC6 MCU serial driver"
diff --git a/drivers/serial/Kconfig.rtt b/drivers/serial/Kconfig.rtt
index 182d809..7cfb0f9 100644
--- a/drivers/serial/Kconfig.rtt
+++ b/drivers/serial/Kconfig.rtt
@@ -1,7 +1,6 @@
-# Kconfig - Virtual UART RTT driver option
-#
+# Virtual UART RTT driver option
+
 # Copyright (c) 2019 omSquare s.r.o.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig UART_RTT
diff --git a/drivers/serial/Kconfig.rv32m1_lpuart b/drivers/serial/Kconfig.rv32m1_lpuart
index 5bd77ee..2f7ef71 100644
--- a/drivers/serial/Kconfig.rv32m1_lpuart
+++ b/drivers/serial/Kconfig.rv32m1_lpuart
@@ -1,9 +1,7 @@
-# Kconfig - RV32M1 SDK LPUART
-#
+# RV32M1 SDK LPUART
+
 # Copyright (c) 2018 Foundries.io
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_RV32M1_LPUART
 	bool "RV32M1 LPUART driver"
diff --git a/drivers/serial/Kconfig.sam0 b/drivers/serial/Kconfig.sam0
index 504d7af..626dfe3 100644
--- a/drivers/serial/Kconfig.sam0
+++ b/drivers/serial/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM SERCOM configuration options
-#
+# Atmel SAM SERCOM configuration options
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/serial/Kconfig.sifive b/drivers/serial/Kconfig.sifive
index 8e745ca..e451b74 100644
--- a/drivers/serial/Kconfig.sifive
+++ b/drivers/serial/Kconfig.sifive
@@ -1,9 +1,7 @@
-# Kconfig.fe310 - SiFive Freedom UART configuration option
-#
+# SiFive Freedom UART configuration option
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_SIFIVE
 	bool "SiFive Freedom serial driver"
diff --git a/drivers/serial/Kconfig.stm32 b/drivers/serial/Kconfig.stm32
index 1af3b85..c4982ea 100644
--- a/drivers/serial/Kconfig.stm32
+++ b/drivers/serial/Kconfig.stm32
@@ -1,9 +1,7 @@
-# Kconfig - STM32 UART configuration
-#
+# STM32 UART configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_STM32
 	bool "STM32 MCU serial driver"
diff --git a/drivers/serial/Kconfig.uart_sam b/drivers/serial/Kconfig.uart_sam
index b321192..a88d1d9 100644
--- a/drivers/serial/Kconfig.uart_sam
+++ b/drivers/serial/Kconfig.uart_sam
@@ -1,9 +1,8 @@
-# Kconfig - Atmel SAM UART configuration options
-#
+# Atmel SAM UART configuration options
+
 # Copyright (c) 2017 Piotr Mienkowski
 # Copyright (c) 2018 Justin Watson
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig UART_SAM
 	bool "Atmel SAM MCU family UART driver"
diff --git a/drivers/serial/Kconfig.usart_sam b/drivers/serial/Kconfig.usart_sam
index a81a3a4..e91d6b5 100644
--- a/drivers/serial/Kconfig.usart_sam
+++ b/drivers/serial/Kconfig.usart_sam
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM USART configuration options
-#
+# Atmel SAM USART configuration options
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig USART_SAM
 	bool "Atmel SAM MCU family USART driver"
diff --git a/drivers/serial/Kconfig.xlnx b/drivers/serial/Kconfig.xlnx
index 9e1896b..9e79a56 100644
--- a/drivers/serial/Kconfig.xlnx
+++ b/drivers/serial/Kconfig.xlnx
@@ -1,9 +1,7 @@
-# Kconfig - Xilinx UART configuration
-#
+# Xilinx UART configuration
+
 # Copyright (c) 2018 Xilinx Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config UART_XLNX_PS
 	bool "Xilinx serial driver for MPSoC"
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index e513c08..56060bc 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - SPI driver configuration options
+# SPI driver configuration options
 
-#
 # Copyright (c) 2015-2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # SPI Drivers
diff --git a/drivers/spi/Kconfig.cc13xx_cc26xx b/drivers/spi/Kconfig.cc13xx_cc26xx
index 7bcea0b..83df3e0 100644
--- a/drivers/spi/Kconfig.cc13xx_cc26xx
+++ b/drivers/spi/Kconfig.cc13xx_cc26xx
@@ -1,9 +1,7 @@
-# Kconfig.spi_cc13xx_cc26xx - TI CC13xx / CC26xx SPI configuration options
-#
+# TI CC13xx / CC26xx SPI configuration options
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SPI_CC13XX_CC26XX
 	bool "TI SimpleLink CC13xx / CC26xx SPI driver"
diff --git a/drivers/spi/Kconfig.dw b/drivers/spi/Kconfig.dw
index d57c1cd..f44f77e 100644
--- a/drivers/spi/Kconfig.dw
+++ b/drivers/spi/Kconfig.dw
@@ -1,10 +1,7 @@
-# Kconfig.dw - DesignWare SPI driver configuration options
-#
-#
+# DesignWare SPI driver configuration options
+
 # Copyright (c) 2015-2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_SPI_DW
 	bool
diff --git a/drivers/spi/Kconfig.litex b/drivers/spi/Kconfig.litex
index 9454d9e..e64088e 100644
--- a/drivers/spi/Kconfig.litex
+++ b/drivers/spi/Kconfig.litex
@@ -1,9 +1,7 @@
-# Kconfig.litex - LiteX SPI (LiteSPI) configuration option
-#
+# LiteX SPI (LiteSPI) configuration option
+
 # Copyright (c) 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SPI_LITESPI
 	bool "LiteX SPI controller driver"
diff --git a/drivers/spi/Kconfig.mcux_dspi b/drivers/spi/Kconfig.mcux_dspi
index 28cc960..bd3df23 100644
--- a/drivers/spi/Kconfig.mcux_dspi
+++ b/drivers/spi/Kconfig.mcux_dspi
@@ -1,10 +1,8 @@
-# Kconfig - MCUXpresso SDK SPI
-#
+# MCUXpresso SDK SPI
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SPI_MCUX_DSPI
 	bool "MCUX SPI driver"
diff --git a/drivers/spi/Kconfig.mcux_lpspi b/drivers/spi/Kconfig.mcux_lpspi
index 1ef8178..5d9741c 100644
--- a/drivers/spi/Kconfig.mcux_lpspi
+++ b/drivers/spi/Kconfig.mcux_lpspi
@@ -1,9 +1,7 @@
-# Kconfig - MCUXpresso SDK SPI
-#
+# MCUXpresso SDK SPI
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SPI_MCUX_LPSPI
 	bool "MCUX SPI driver"
diff --git a/drivers/spi/Kconfig.nrfx b/drivers/spi/Kconfig.nrfx
index 40a6cd6..9353f68 100644
--- a/drivers/spi/Kconfig.nrfx
+++ b/drivers/spi/Kconfig.nrfx
@@ -1,7 +1,5 @@
 # Copyright (c) 2017 - 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SPI_NRFX
 	bool "nRF SPI nrfx drivers"
diff --git a/drivers/spi/Kconfig.oc_simple b/drivers/spi/Kconfig.oc_simple
index d11339e..11b1d8d 100644
--- a/drivers/spi/Kconfig.oc_simple
+++ b/drivers/spi/Kconfig.oc_simple
@@ -1,10 +1,7 @@
-# Kconfig - Simple SPI Driver configuration options
+# Simple SPI Driver configuration options
 
-#
 # Copyright (c) 2019 Western Digital Corporation or its affiliates
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SPI_OC_SIMPLE
 	bool "OpenCores Simple SPI controller driver"
diff --git a/drivers/spi/Kconfig.sam b/drivers/spi/Kconfig.sam
index 7620e76..79c2563 100644
--- a/drivers/spi/Kconfig.sam
+++ b/drivers/spi/Kconfig.sam
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM SPI
-#
+# Atmel SAM SPI
+
 # Copyright (c) 2018 qianfan Zhao
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/spi/Kconfig.sam0 b/drivers/spi/Kconfig.sam0
index 102c0c3..88f48fb 100644
--- a/drivers/spi/Kconfig.sam0
+++ b/drivers/spi/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 SERCOM SPI
-#
+# Atmel SAM0 SERCOM SPI
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/spi/Kconfig.sifive b/drivers/spi/Kconfig.sifive
index c0b6ff7..34bb0fd 100644
--- a/drivers/spi/Kconfig.sifive
+++ b/drivers/spi/Kconfig.sifive
@@ -1,10 +1,7 @@
-# Kconfig - SiFive SPI Driver configuration options
+# SiFive SPI Driver configuration options
 
-#
 # Copyright (c) 2018 SiFive Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SPI_SIFIVE
 	bool "SiFive SPI controller driver"
diff --git a/drivers/spi/Kconfig.stm32 b/drivers/spi/Kconfig.stm32
index f1bfcca..be1b092 100644
--- a/drivers/spi/Kconfig.stm32
+++ b/drivers/spi/Kconfig.stm32
@@ -1,10 +1,7 @@
-# Kconfig - STM32 SPI driver configuration options
+# STM32 SPI driver configuration options
 
-#
 # Copyright (c) 2015-2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SPI_STM32
 	bool "STM32 MCU SPI controller driver"
diff --git a/drivers/spi/Kconfig.xec_qmspi b/drivers/spi/Kconfig.xec_qmspi
index c788e28..f7fd70e 100644
--- a/drivers/spi/Kconfig.xec_qmspi
+++ b/drivers/spi/Kconfig.xec_qmspi
@@ -1,4 +1,4 @@
-# Kconfig - Microchip XEC QMSPI
+# Microchip XEC QMSPI
 
 # Copyright (c) 2019 Microchip Technology Inc.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index c716626..e0694f7 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -1,13 +1,9 @@
-# Kconfig - timer driver configuration options
+# Timer driver configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Cadence Design Systems, Inc.
 # Copyright (c) 2019 Intel Corp.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menu "Timer Drivers"
 
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index da2b1bb..4e3f0f7 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - USB configuration options
+# USB configuration options
 
-#
 # Copyright (c) 2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig USB
 	bool "USB"
diff --git a/drivers/usb/device/Kconfig b/drivers/usb/device/Kconfig
index fc8f0ba..301b733 100644
--- a/drivers/usb/device/Kconfig
+++ b/drivers/usb/device/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - USB device configuration options
+# USB device configuration options
 
-#
 # Copyright (c) 2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if USB
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0e124be..0f35edb 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - VIDEO driver configuration options
+# VIDEO driver configuration options
 
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # VIDEO Drivers
diff --git a/drivers/video/Kconfig.mcux_csi b/drivers/video/Kconfig.mcux_csi
index 35039a1..cc25659 100644
--- a/drivers/video/Kconfig.mcux_csi
+++ b/drivers/video/Kconfig.mcux_csi
@@ -1,4 +1,4 @@
-# Kconfig - NXP MCUX CSI driver configuration options
+# NXP MCUX CSI driver configuration options
 
 # Copyright (c) 2019, Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
diff --git a/drivers/video/Kconfig.mt9m114 b/drivers/video/Kconfig.mt9m114
index 990b439..298ea55 100644
--- a/drivers/video/Kconfig.mt9m114
+++ b/drivers/video/Kconfig.mt9m114
@@ -1,4 +1,4 @@
-# Kconfig - MT9m114
+# MT9m114
 
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
diff --git a/drivers/video/Kconfig.sw_generator b/drivers/video/Kconfig.sw_generator
index a3948e2..f258a00 100644
--- a/drivers/video/Kconfig.sw_generator
+++ b/drivers/video/Kconfig.sw_generator
@@ -1,4 +1,4 @@
-# Kconfig - MT9m114
+# MT9m114
 
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4871452..2bd14a1 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig - Watchdog configuration options
-#
+# Watchdog configuration options
+
 # Copyright (c) 2015 Intel Corporation
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WATCHDOG
 	bool "Watchdog Support"
diff --git a/drivers/watchdog/Kconfig.cmsdk_apb b/drivers/watchdog/Kconfig.cmsdk_apb
index 9807808..e61a687 100644
--- a/drivers/watchdog/Kconfig.cmsdk_apb
+++ b/drivers/watchdog/Kconfig.cmsdk_apb
@@ -1,10 +1,7 @@
-# Kconfig.cmsdk_ahb - ARM CMSDK (Cortex-M System Design Kit) AHB WDOG cfg
-#
-#
+# ARM CMSDK (Cortex-M System Design Kit) AHB WDOG cfg
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_ARM
 
diff --git a/drivers/watchdog/Kconfig.esp32 b/drivers/watchdog/Kconfig.esp32
index 181f316..38e2b1b 100644
--- a/drivers/watchdog/Kconfig.esp32
+++ b/drivers/watchdog/Kconfig.esp32
@@ -1,9 +1,7 @@
-# Kconfig - ESP32 WDT configuration
-#
+# ESP32 WDT configuration
+
 # Copyright (C) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WDT_ESP32
 	bool "ESP32 Watchdog (WDT) Driver"
diff --git a/drivers/watchdog/Kconfig.mcux b/drivers/watchdog/Kconfig.mcux
index 07e6b72..864b134 100644
--- a/drivers/watchdog/Kconfig.mcux
+++ b/drivers/watchdog/Kconfig.mcux
@@ -1,9 +1,7 @@
-# Kconfig - Watchdog configuration options
-#
+# Watchdog configuration options
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config WDT_MCUX_WDOG
 	bool "MCUX WDOG driver"
diff --git a/drivers/watchdog/Kconfig.nrfx b/drivers/watchdog/Kconfig.nrfx
index aa16679..52bd907 100644
--- a/drivers/watchdog/Kconfig.nrfx
+++ b/drivers/watchdog/Kconfig.nrfx
@@ -1,7 +1,6 @@
-# Kconfig - nrfx WDT support
-#
+# nrfx WDT support
+
 # Copyright (c) 2018, Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config WDT_NRFX
diff --git a/drivers/watchdog/Kconfig.sam b/drivers/watchdog/Kconfig.sam
index 3748fed..70e31ff 100644
--- a/drivers/watchdog/Kconfig.sam
+++ b/drivers/watchdog/Kconfig.sam
@@ -1,9 +1,7 @@
-# Kconfig - Atmel SAM WDT configuration
-#
+# Atmel SAM WDT configuration
+
 # Copyright (C) 2017 Intel Deutschland GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config WDT_SAM
 	bool "Atmel SAM MCU Family Watchdog (WDT) Driver"
diff --git a/drivers/watchdog/Kconfig.sam0 b/drivers/watchdog/Kconfig.sam0
index eba112d..db992f7 100644
--- a/drivers/watchdog/Kconfig.sam0
+++ b/drivers/watchdog/Kconfig.sam0
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 WDT configuration
-#
+# Atmel SAM0 WDT configuration
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/drivers/watchdog/Kconfig.stm32 b/drivers/watchdog/Kconfig.stm32
index 1b3c2c8..132ebfe 100644
--- a/drivers/watchdog/Kconfig.stm32
+++ b/drivers/watchdog/Kconfig.stm32
@@ -1,11 +1,9 @@
-# Kconfig - STM32 IWDG configuration
-#
+# STM32 IWDG configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2017 RnDity Sp. z o.o.
 # Copyright (c) 2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig IWDG_STM32
 	bool "Independent Watchdog (IWDG) Driver for STM32 family of MCUs"
diff --git a/drivers/watchdog/Kconfig.xec b/drivers/watchdog/Kconfig.xec
index c45b934..355faff 100644
--- a/drivers/watchdog/Kconfig.xec
+++ b/drivers/watchdog/Kconfig.xec
@@ -1,9 +1,7 @@
-# Kconfig - Microchip XEC Watchdog Timer configuration
-#
+# Microchip XEC Watchdog Timer configuration
+
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config WDT_XEC
 	bool "Microchip XEC series Watchdog Timer (WDT) driver"
diff --git a/drivers/wifi/Kconfig b/drivers/wifi/Kconfig
index 926909a..aa2bbdf 100644
--- a/drivers/wifi/Kconfig
+++ b/drivers/wifi/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - WiFi drivers configuration options
+# WiFi drivers configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WIFI
 	bool "add support for Wi-Fi Drivers"
diff --git a/drivers/wifi/eswifi/Kconfig.eswifi b/drivers/wifi/eswifi/Kconfig.eswifi
index 6299210..e51cb68 100644
--- a/drivers/wifi/eswifi/Kconfig.eswifi
+++ b/drivers/wifi/eswifi/Kconfig.eswifi
@@ -1,10 +1,7 @@
-# Kconfig - es-WiFi driver options
+# es-WiFi driver options
 
-#
 # Copyright (c) 2018 Linaro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WIFI_ESWIFI
 	bool "Inventek eS-WiFi support"
diff --git a/drivers/wifi/simplelink/Kconfig.simplelink b/drivers/wifi/simplelink/Kconfig.simplelink
index b7f74e5..6e59c37 100644
--- a/drivers/wifi/simplelink/Kconfig.simplelink
+++ b/drivers/wifi/simplelink/Kconfig.simplelink
@@ -1,10 +1,7 @@
-# Kconfig - SimpleLink WiFi driver options
+# SimpleLink WiFi driver options
 
-#
 # Copyright (c) 2018 Texas Instruments, Incorporated
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WIFI_SIMPLELINK
 	bool "SimpleLink Wi-Fi driver support"
diff --git a/drivers/wifi/winc1500/Kconfig.winc1500 b/drivers/wifi/winc1500/Kconfig.winc1500
index d6921e9..7c3d8bb 100644
--- a/drivers/wifi/winc1500/Kconfig.winc1500
+++ b/drivers/wifi/winc1500/Kconfig.winc1500
@@ -1,10 +1,7 @@
-# Kconfig - Atmel WINC1500 WiFi driver options
+# Atmel WINC1500 WiFi driver options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WIFI_WINC1500
 	bool "WINC1500 driver support"
diff --git a/ext/Kconfig b/ext/Kconfig
index fa9eaea..e85b0a3 100644
--- a/ext/Kconfig
+++ b/ext/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - external source code configuration options
+# External source code configuration options
 
-#
 # Copyright (c) 2016 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "External Sources"
 
diff --git a/ext/hal/Kconfig b/ext/hal/Kconfig
index 4b6f078..bd6ea88 100644
--- a/ext/hal/Kconfig
+++ b/ext/hal/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - external HAL source code configuration options
+# External HAL source code configuration options
 
-#
 # Copyright (c) 2016-2017 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # When adding new entries keep the list in alphabetical order
 
diff --git a/ext/hal/altera/Kconfig b/ext/hal/altera/Kconfig
index b1e7872..0395154 100644
--- a/ext/hal/altera/Kconfig
+++ b/ext/hal/altera/Kconfig
@@ -1,8 +1,6 @@
-# Kconfig - Altera HAL drivers configuration
+# Altera HAL drivers configuration
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config HAS_ALTERA_HAL
diff --git a/ext/lib/crypto/Kconfig b/ext/lib/crypto/Kconfig
index beddcb6..9c930ac 100644
--- a/ext/lib/crypto/Kconfig
+++ b/ext/lib/crypto/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Cryptography"
 
diff --git a/ext/lib/crypto/tinycrypt/Kconfig b/ext/lib/crypto/tinycrypt/Kconfig
index f91cfdc..209228d 100644
--- a/ext/lib/crypto/tinycrypt/Kconfig
+++ b/ext/lib/crypto/tinycrypt/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Cryptography primitive options for TinyCrypt version 2.0
+# Cryptography primitive options for TinyCrypt version 2.0
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config TINYCRYPT
 	bool "TinyCrypt Support"
diff --git a/ext/lib/fnmatch/Kconfig b/ext/lib/fnmatch/Kconfig
index b745fd7..308c02f 100644
--- a/ext/lib/fnmatch/Kconfig
+++ b/ext/lib/fnmatch/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Nordic Semiconductor
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config FNMATCH
 	bool "Fnmatch Support"
diff --git a/kernel/Kconfig b/kernel/Kconfig
index c84c634..c8c1a9c 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -1,11 +1,7 @@
-# Kconfig - kernel configuration options
+# Kernel configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 menu "General Kernel Options"
 
diff --git a/kernel/Kconfig.power_mgmt b/kernel/Kconfig.power_mgmt
index 03cc6f9..3a2f133 100644
--- a/kernel/Kconfig.power_mgmt
+++ b/kernel/Kconfig.power_mgmt
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SYS_POWER_MANAGEMENT
 	bool "System Power management"
diff --git a/lib/Kconfig b/lib/Kconfig
index 3a24478..cd731a0 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "lib/libc/Kconfig"
 
diff --git a/lib/cmsis_rtos_v1/Kconfig b/lib/cmsis_rtos_v1/Kconfig
index 40c022f..fdfbc19 100644
--- a/lib/cmsis_rtos_v1/Kconfig
+++ b/lib/cmsis_rtos_v1/Kconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config CMSIS_RTOS_V1
 	bool "CMSIS RTOS v1 API"
 	depends on THREAD_CUSTOM_DATA
diff --git a/lib/cmsis_rtos_v2/Kconfig b/lib/cmsis_rtos_v2/Kconfig
index 61cb15d..d79fb04 100644
--- a/lib/cmsis_rtos_v2/Kconfig
+++ b/lib/cmsis_rtos_v2/Kconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config CMSIS_RTOS_V2
 	bool "CMSIS RTOS v2 API"
 	depends on POLL
diff --git a/lib/gui/Kconfig b/lib/gui/Kconfig
index 9b37dad..f2043bd 100644
--- a/lib/gui/Kconfig
+++ b/lib/gui/Kconfig
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 rsource "lvgl/Kconfig"
diff --git a/lib/gui/lvgl/Kconfig b/lib/gui/lvgl/Kconfig
index c3afe89..df39e2c 100644
--- a/lib/gui/lvgl/Kconfig
+++ b/lib/gui/lvgl/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018-2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LVGL
 	bool "LittlevGL GUI library"
diff --git a/lib/gui/lvgl/Kconfig.fonts b/lib/gui/lvgl/Kconfig.fonts
index bb49a75..c253d96 100644
--- a/lib/gui/lvgl/Kconfig.fonts
+++ b/lib/gui/lvgl/Kconfig.fonts
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Fonts"
 
diff --git a/lib/gui/lvgl/Kconfig.objects b/lib/gui/lvgl/Kconfig.objects
index 1686efc..199f243 100644
--- a/lib/gui/lvgl/Kconfig.objects
+++ b/lib/gui/lvgl/Kconfig.objects
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018-2019 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Objects"
 
diff --git a/lib/gui/lvgl/Kconfig.themes b/lib/gui/lvgl/Kconfig.themes
index 160e89a..0fc6fc1 100644
--- a/lib/gui/lvgl/Kconfig.themes
+++ b/lib/gui/lvgl/Kconfig.themes
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Jan Van Winkel <jan.van_winkel@dxplore.eu>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Themes"
 
diff --git a/lib/libc/Kconfig b/lib/libc/Kconfig
index 63a0cb3..2a70f76 100644
--- a/lib/libc/Kconfig
+++ b/lib/libc/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - C library
+# C library
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "C Library"
 
diff --git a/lib/os/Kconfig b/lib/os/Kconfig
index b89ddd1..123d663 100644
--- a/lib/os/Kconfig
+++ b/lib/os/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "OS Support Library"
 
diff --git a/lib/posix/Kconfig b/lib/posix/Kconfig
index f2610df..35f8048 100644
--- a/lib/posix/Kconfig
+++ b/lib/posix/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config POSIX_MAX_FDS
 	int "Maximum number of open file descriptors"
diff --git a/lib/updatehub/Kconfig b/lib/updatehub/Kconfig
index 25da09d..8eada0c 100644
--- a/lib/updatehub/Kconfig
+++ b/lib/updatehub/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, 2019 O.S.Systems
-#
 # SPDX -License-Identifier: Apache-2.0
-#
 
 menuconfig UPDATEHUB
 	bool"UpdateHub Firmware Over-the-Air support"
diff --git a/modules/Kconfig b/modules/Kconfig
index 006dc97..b004175 100644
--- a/modules/Kconfig
+++ b/modules/Kconfig
@@ -1,6 +1,4 @@
-
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 comment "Optional modules. Make sure they're installed, via the project manifest."
diff --git a/modules/Kconfig.atmel b/modules/Kconfig.atmel
index 25c5a1a..9807625 100644
--- a/modules/Kconfig.atmel
+++ b/modules/Kconfig.atmel
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SDK
-#
+# Atmel SDK
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ASF
 	bool
diff --git a/modules/Kconfig.civetweb b/modules/Kconfig.civetweb
index 30618e5..663081b 100644
--- a/modules/Kconfig.civetweb
+++ b/modules/Kconfig.civetweb
@@ -1,5 +1,4 @@
 # Copyright (c) 2019 Antmicro Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config CIVETWEB
diff --git a/modules/Kconfig.cypress b/modules/Kconfig.cypress
index acf57da..5ff6b49 100644
--- a/modules/Kconfig.cypress
+++ b/modules/Kconfig.cypress
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Cypress Semiconductor
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_CYPRESS_DRIVERS
 	bool
diff --git a/modules/Kconfig.imx b/modules/Kconfig.imx
index eb1f918..dc30765 100644
--- a/modules/Kconfig.imx
+++ b/modules/Kconfig.imx
@@ -1,5 +1,5 @@
-# Kconfig - IMX M4 Core SDK
-#
+# IMX M4 Core SDK
+
 # Copyright (c) 2018, NXP
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/modules/Kconfig.mbedtls b/modules/Kconfig.mbedtls
index db4815d..5c2de43 100644
--- a/modules/Kconfig.mbedtls
+++ b/modules/Kconfig.mbedtls
@@ -1,18 +1,7 @@
-# Kconfig - Cryptography primitive options for mbed TLS
+# Cryptography primitive options for mbed TLS
 
 # Copyright (c) 2016 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 
 menuconfig MBEDTLS
 	bool "mbedTLS Support"
diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux
index 3e30899..886c362 100644
--- a/modules/Kconfig.mcux
+++ b/modules/Kconfig.mcux
@@ -1,5 +1,5 @@
-# Kconfig - MCUXpresso SDK
-#
+# MCUXpresso SDK
+
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/modules/Kconfig.microchip b/modules/Kconfig.microchip
index c5eb1ea..2e1e1ab 100644
--- a/modules/Kconfig.microchip
+++ b/modules/Kconfig.microchip
@@ -1,5 +1,5 @@
-# Kconfig - Microchip MEC HAL drivers configuration
-#
+# Microchip MEC HAL drivers configuration
+
 # SPDX-License-Identifier: Apache-2.0
 
 config HAS_MEC_HAL
diff --git a/modules/Kconfig.silabs b/modules/Kconfig.silabs
index 71aba9b..8abab8b 100644
--- a/modules/Kconfig.silabs
+++ b/modules/Kconfig.silabs
@@ -1,5 +1,5 @@
-# Kconfig - Gecko SDK
-#
+# Gecko SDK
+
 # Copyright (c) 2017, Christian Taedcke
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/modules/Kconfig.simplelink b/modules/Kconfig.simplelink
index 8fa3bba..4506a91 100644
--- a/modules/Kconfig.simplelink
+++ b/modules/Kconfig.simplelink
@@ -1,4 +1,4 @@
-# Kconfig - CC3220/CC32XX SDK HAL configuration
+# CC3220/CC32XX SDK HAL configuration
 
 config HAS_CC3220SDK
 	bool
@@ -19,13 +19,13 @@
 	help
 	  Build the SimpleLink host driver
 
-# Kconfig - MSP432 SDK HAL configuration
+# MSP432 SDK HAL configuration
 
 config HAS_MSP432P4XXSDK
 	bool
 	select HAS_CMSIS_CORE
 
-# Kconfig - CC13X2 / CC26X2 SDK HAL configuration
+# CC13X2 / CC26X2 SDK HAL configuration
 
 config HAS_CC13X2_CC26X2_SDK
 	bool
diff --git a/modules/Kconfig.st b/modules/Kconfig.st
index a84dfeb..6276eca 100644
--- a/modules/Kconfig.st
+++ b/modules/Kconfig.st
@@ -1,4 +1,4 @@
-# Kconfig - STLIB config
+# STLIB config
 
 # Copyright (c) 2017 STMicroelectronics
 
diff --git a/modules/Kconfig.stm32 b/modules/Kconfig.stm32
index 4d22c29..3c4a743 100644
--- a/modules/Kconfig.stm32
+++ b/modules/Kconfig.stm32
@@ -1,4 +1,4 @@
-# Kconfig - STM32CUBE HAL config
+# STM32CUBE HAL config
 
 # Copyright (c) 2016 Linaro Limited.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/modules/Kconfig.tls-generic b/modules/Kconfig.tls-generic
index e8e0f67..a2ecaea 100644
--- a/modules/Kconfig.tls-generic
+++ b/modules/Kconfig.tls-generic
@@ -1,4 +1,4 @@
-# Kconfig.tls - TLS/DTLS related options
+# TLS/DTLS related options
 
 # Copyright (c) 2018 Intel Corporation
 # Copyright (c) 2018 Nordic Semiconductor ASA
diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig
index aad2d9b..9b4cad1 100644
--- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig
+++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10056 board configuration
-#
+# nRF52840 PCA10056 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10056
diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board
index c7eebe1..b118982 100644
--- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board
+++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.board
@@ -1,7 +1,6 @@
-# Kconfig - nRF52840 PCA10056 board configuration
-#
+# nRF52840 PCA10056 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config  BOARD_NRF52840_PCA10056
diff --git a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig
index 7af543d..11fea67 100644
--- a/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig
+++ b/samples/application_development/out_of_tree_board/boards/arm/nrf52840_pca10056/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - nRF52 PCA10040 board configuration
-#
+# nRF52 PCA10040 board configuration
+
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if BOARD_NRF52840_PCA10056
diff --git a/samples/bluetooth/hci_usb/Kconfig b/samples/bluetooth/hci_usb/Kconfig
index e474b69..f3aab7d 100644
--- a/samples/bluetooth/hci_usb/Kconfig
+++ b/samples/bluetooth/hci_usb/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_BLE_HCI_SAMPLE
diff --git a/samples/drivers/CAN/Kconfig b/samples/drivers/CAN/Kconfig
index 922145b..1280999 100644
--- a/samples/drivers/CAN/Kconfig
+++ b/samples/drivers/CAN/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for can sample app
+# Private config options for can sample app
 
-#
 # Copyright (c) 2018 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Controller Area Network sample application"
 
diff --git a/samples/drivers/counter/alarm/Kconfig b/samples/drivers/counter/alarm/Kconfig
index 3d69b8a..ce09c4f 100644
--- a/samples/drivers/counter/alarm/Kconfig
+++ b/samples/drivers/counter/alarm/Kconfig
@@ -1,11 +1,7 @@
+# Config for counter alarm sample
 
-# Kconfig - Config for counter alarm sample
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 config COUNTER_RTC0
 	bool
diff --git a/samples/drivers/espi/Kconfig b/samples/drivers/espi/Kconfig
index d704541..aebe98d 100644
--- a/samples/drivers/espi/Kconfig
+++ b/samples/drivers/espi/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for eSPI sample app
+# Private config options for eSPI sample app
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Enhanced Serial Peripheral Interface application"
 
diff --git a/samples/net/google_iot_mqtt/Kconfig b/samples/net/google_iot_mqtt/Kconfig
index 8398d07..5bcba2e 100644
--- a/samples/net/google_iot_mqtt/Kconfig
+++ b/samples/net/google_iot_mqtt/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for Google Cloud IOT application
+# Private config options for Google Cloud IOT application
 
-#
 # Copyright (c) 2018 Linaro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Google IOT MQTT/TLS sample application"
 
diff --git a/samples/net/gptp/Kconfig b/samples/net/gptp/Kconfig
index 440aa39..8ed6821 100644
--- a/samples/net/gptp/Kconfig
+++ b/samples/net/gptp/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for gPTP sample app
+# Private config options for gPTP sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # This sample application will have three network interfaces.
 # gPTP protocol will run in the non-VLAN interface and then there
diff --git a/samples/net/lldp/Kconfig b/samples/net/lldp/Kconfig
index ac468f2..3c8f72c 100644
--- a/samples/net/lldp/Kconfig
+++ b/samples/net/lldp/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for LLDP sample app
+# Private config options for LLDP sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # This sample application will have three network interfaces.
 
diff --git a/samples/net/sockets/dumb_http_server_mt/Kconfig b/samples/net/sockets/dumb_http_server_mt/Kconfig
index 493eb77..867643a 100644
--- a/samples/net/sockets/dumb_http_server_mt/Kconfig
+++ b/samples/net/sockets/dumb_http_server_mt/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for this sample app
+# Private config options for this sample app
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Networking dumb-http-server-mt sample application"
 
diff --git a/samples/net/sockets/echo_client/Kconfig b/samples/net/sockets/echo_client/Kconfig
index 4577867..01d423f 100644
--- a/samples/net/sockets/echo_client/Kconfig
+++ b/samples/net/sockets/echo_client/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for echo-client sample app
+# Private config options for echo-client sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Networking echo-client sample application"
 
diff --git a/samples/net/sockets/echo_server/Kconfig b/samples/net/sockets/echo_server/Kconfig
index 94b2908..5e28415 100644
--- a/samples/net/sockets/echo_server/Kconfig
+++ b/samples/net/sockets/echo_server/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for echo-server sample app
+# Private config options for echo-server sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Networking echo-server sample application"
 
diff --git a/samples/net/stats/Kconfig b/samples/net/stats/Kconfig
index 3397114..61161fb 100644
--- a/samples/net/stats/Kconfig
+++ b/samples/net/stats/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for network statistics sample app
+# Private config options for network statistics sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Network statistics sample application"
 
diff --git a/samples/net/updatehub/Kconfig b/samples/net/updatehub/Kconfig
index c337003..83c324c 100644
--- a/samples/net/updatehub/Kconfig
+++ b/samples/net/updatehub/Kconfig
@@ -1,8 +1,6 @@
-#
 #  Copyright (c) 2018 O.S.Systems
-#
 #  SPDX-License-Identifier: Apache-2.0
-#
+
 mainmenu "Sample app Configuration"
 
 config UPDATEHUB_MANUAL
diff --git a/samples/net/vlan/Kconfig b/samples/net/vlan/Kconfig
index 6bb8acb..92ef899 100644
--- a/samples/net/vlan/Kconfig
+++ b/samples/net/vlan/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Private config options for VLAN sample app
+# Private config options for VLAN sample app
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Networking VLAN sample application"
 
diff --git a/samples/subsys/fs/littlefs/Kconfig b/samples/subsys/fs/littlefs/Kconfig
index 3a784b0..6ca768d 100644
--- a/samples/subsys/fs/littlefs/Kconfig
+++ b/samples/subsys/fs/littlefs/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2019 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config APP_WIPE_STORAGE
 	bool "Option to clear the flash area before mounting"
diff --git a/samples/subsys/logging/logger/Kconfig b/samples/subsys/logging/logger/Kconfig
index d442f50..eb88f2f 100644
--- a/samples/subsys/logging/logger/Kconfig
+++ b/samples/subsys/logging/logger/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Config options for logger sample app
-#
+# Config options for logger sample app
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Logger sample application"
 
diff --git a/samples/subsys/shell/shell_module/Kconfig b/samples/subsys/shell/shell_module/Kconfig
index e1e0968..900437b 100644
--- a/samples/subsys/shell/shell_module/Kconfig
+++ b/samples/subsys/shell/shell_module/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Config options for logger sample app
-#
+# Config options for logger sample app
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 mainmenu "Logger sample application"
 
diff --git a/samples/subsys/usb/cdc_acm/Kconfig b/samples/subsys/usb/cdc_acm/Kconfig
index 86c7b98..442e894 100644
--- a/samples/subsys/usb/cdc_acm/Kconfig
+++ b/samples/subsys/usb/cdc_acm/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_CDC_ACM_SAMPLE
diff --git a/samples/subsys/usb/cdc_acm_composite/Kconfig b/samples/subsys/usb/cdc_acm_composite/Kconfig
index 7457577..0db92f0 100644
--- a/samples/subsys/usb/cdc_acm_composite/Kconfig
+++ b/samples/subsys/usb/cdc_acm_composite/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_CDC_ACM_COMPOSITE_SAMPLE
diff --git a/samples/subsys/usb/console/Kconfig b/samples/subsys/usb/console/Kconfig
index 5281f62..c89db54 100644
--- a/samples/subsys/usb/console/Kconfig
+++ b/samples/subsys/usb/console/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_CONSOLE_SAMPLE
diff --git a/samples/subsys/usb/dfu/Kconfig b/samples/subsys/usb/dfu/Kconfig
index 28aa3f1..7da7b62 100644
--- a/samples/subsys/usb/dfu/Kconfig
+++ b/samples/subsys/usb/dfu/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_DFU_SAMPLE
diff --git a/samples/subsys/usb/hid-cdc/Kconfig b/samples/subsys/usb/hid-cdc/Kconfig
index 4ba868e..48a9852 100644
--- a/samples/subsys/usb/hid-cdc/Kconfig
+++ b/samples/subsys/usb/hid-cdc/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_HID_CDC_SAMPLE
diff --git a/samples/subsys/usb/hid-mouse/Kconfig b/samples/subsys/usb/hid-mouse/Kconfig
index 8e79718..70b23a0 100644
--- a/samples/subsys/usb/hid-mouse/Kconfig
+++ b/samples/subsys/usb/hid-mouse/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_HID_MOUSE_SAMPLE
diff --git a/samples/subsys/usb/hid/Kconfig b/samples/subsys/usb/hid/Kconfig
index 85e5fc9..ac8b63e 100644
--- a/samples/subsys/usb/hid/Kconfig
+++ b/samples/subsys/usb/hid/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_HID_SAMPLE
diff --git a/samples/subsys/usb/mass/Kconfig b/samples/subsys/usb/mass/Kconfig
index ff44fef..49dcd4d 100644
--- a/samples/subsys/usb/mass/Kconfig
+++ b/samples/subsys/usb/mass/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_MASS_SAMPLE
diff --git a/samples/subsys/usb/testusb/Kconfig b/samples/subsys/usb/testusb/Kconfig
index daa0166..4a4b257 100644
--- a/samples/subsys/usb/testusb/Kconfig
+++ b/samples/subsys/usb/testusb/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_TESTUSB_SAMPLE
diff --git a/samples/subsys/usb/usb_pid.Kconfig b/samples/subsys/usb/usb_pid.Kconfig
index a0e0672..e745220 100644
--- a/samples/subsys/usb/usb_pid.Kconfig
+++ b/samples/subsys/usb/usb_pid.Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_PID_CDC_ACM_SAMPLE
 	hex
diff --git a/samples/subsys/usb/webusb/Kconfig b/samples/subsys/usb/webusb/Kconfig
index dd9da56..b2b4748 100644
--- a/samples/subsys/usb/webusb/Kconfig
+++ b/samples/subsys/usb/webusb/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_PID
 	default USB_PID_WEBUSB_SAMPLE
diff --git a/soc/arc/snps_arc_hsdk/Kconfig.defconfig b/soc/arc/snps_arc_hsdk/Kconfig.defconfig
index 9aa32d9..1ba86b6 100644
--- a/soc/arc/snps_arc_hsdk/Kconfig.defconfig
+++ b/soc/arc/snps_arc_hsdk/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_ARC_HSDK
 
diff --git a/soc/arc/snps_arc_hsdk/Kconfig.soc b/soc/arc/snps_arc_hsdk/Kconfig.soc
index 6699a8e..2706859 100644
--- a/soc/arc/snps_arc_hsdk/Kconfig.soc
+++ b/soc/arc/snps_arc_hsdk/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_ARC_HSDK
 	bool "Synopsys ARC HSDK SoC"
diff --git a/soc/arc/snps_arc_iot/Kconfig.defconfig b/soc/arc/snps_arc_iot/Kconfig.defconfig
index 1eb16ba..b9a840f 100644
--- a/soc/arc/snps_arc_iot/Kconfig.defconfig
+++ b/soc/arc/snps_arc_iot/Kconfig.defconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_ARC_IOT
 
diff --git a/soc/arc/snps_arc_iot/Kconfig.soc b/soc/arc/snps_arc_iot/Kconfig.soc
index 9fc8f1a..a411b67 100644
--- a/soc/arc/snps_arc_iot/Kconfig.soc
+++ b/soc/arc/snps_arc_iot/Kconfig.soc
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_ARC_IOT
 	bool "Synopsys ARC IoT SoC"
diff --git a/soc/arc/snps_emsdp/Kconfig b/soc/arc/snps_emsdp/Kconfig
index 8954680..9d2a42e 100644
--- a/soc/arc/snps_emsdp/Kconfig
+++ b/soc/arc/snps_emsdp/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_ARC_EMSDP
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig b/soc/arc/snps_emsdp/Kconfig.defconfig
index c9cc447..9daa408 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_ARC_EMSDP
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
index f2e284f..bdcccca 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM11D
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em4 b/soc/arc/snps_emsdp/Kconfig.defconfig.em4
index 6ad1711..32eb5d5 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em4
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em4
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM4
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
index 9e11b2a..d19c5ae 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM5D
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em6 b/soc/arc/snps_emsdp/Kconfig.defconfig.em6
index 64baab4..4dec1d4 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em6
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em6
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM6
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
index 174a224..231b88c 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM7D
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
index 40106ab..03013b5 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM7D_ESP
 
diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
index 314f72f..910b4d2 100644
--- a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
+++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSDP_EM9D
 
diff --git a/soc/arc/snps_emsdp/Kconfig.soc b/soc/arc/snps_emsdp/Kconfig.soc
index 7a61f8c..400425e 100644
--- a/soc/arc/snps_emsdp/Kconfig.soc
+++ b/soc/arc/snps_emsdp/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_ARC_EMSDP
 	bool "Synopsys ARC EM Software Development Platform"
diff --git a/soc/arc/snps_emsk/Kconfig b/soc/arc/snps_emsk/Kconfig
index 0d45678..74003a9 100644
--- a/soc/arc/snps_emsk/Kconfig
+++ b/soc/arc/snps_emsk/Kconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSK
 
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig b/soc/arc/snps_emsk/Kconfig.defconfig
index 75b4b06..4d25c7b 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig
+++ b/soc/arc/snps_emsk/Kconfig.defconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSK
 
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em11d b/soc/arc/snps_emsk/Kconfig.defconfig.em11d
index f3bc52d..6c40458 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em11d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em11d
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSK_EM11D
 
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em7d b/soc/arc/snps_emsk/Kconfig.defconfig.em7d
index 5701563..a3933dc 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em7d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em7d
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSK_EM7D
 
diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em9d b/soc/arc/snps_emsk/Kconfig.defconfig.em9d
index eff786a..00114ba 100644
--- a/soc/arc/snps_emsk/Kconfig.defconfig.em9d
+++ b/soc/arc/snps_emsk/Kconfig.defconfig.em9d
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_EMSK_EM9D
 
diff --git a/soc/arc/snps_emsk/Kconfig.soc b/soc/arc/snps_emsk/Kconfig.soc
index 00269c6..65fddb0 100644
--- a/soc/arc/snps_emsk/Kconfig.soc
+++ b/soc/arc/snps_emsk/Kconfig.soc
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2014 Wind River Systems, Inc.
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_EMSK
 	bool "Synopsys ARC EM Starter Kit SoC"
diff --git a/soc/arc/snps_nsim/Kconfig b/soc/arc/snps_nsim/Kconfig
index 3c2e0b9..3cb80f7 100644
--- a/soc/arc/snps_nsim/Kconfig
+++ b/soc/arc/snps_nsim/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM
 
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig b/soc/arc/snps_nsim/Kconfig.defconfig
index a2eb40f..747bfd9 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig
+++ b/soc/arc/snps_nsim/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM
 
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.em b/soc/arc/snps_nsim/Kconfig.defconfig.em
index 39b84fd..e74df66 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.em
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.em
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM_EM
 
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs b/soc/arc/snps_nsim/Kconfig.defconfig.hs
index 91da724..a1fd905 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.hs
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM_HS
 
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
index 18d1a6c..4a6d3e6 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM_HS_SMP
 
diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.sem b/soc/arc/snps_nsim/Kconfig.defconfig.sem
index a64e699..8bfa5c2 100644
--- a/soc/arc/snps_nsim/Kconfig.defconfig.sem
+++ b/soc/arc/snps_nsim/Kconfig.defconfig.sem
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NSIM_SEM
 
diff --git a/soc/arc/snps_nsim/Kconfig.soc b/soc/arc/snps_nsim/Kconfig.soc
index 1fae27a..82d8698 100644
--- a/soc/arc/snps_nsim/Kconfig.soc
+++ b/soc/arc/snps_nsim/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Synopsys, Inc. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_NSIM
 	bool "Synopsys nSIM simulator for ARC cores"
diff --git a/soc/arm/Kconfig b/soc/arm/Kconfig
index d83fe84..4cc3f7d 100644
--- a/soc/arm/Kconfig
+++ b/soc/arm/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - general options signifying CPU capabilities of ARM SoCs
+# General options signifying CPU capabilities of ARM SoCs
 
 # Copyright (c) 2018 Nordic Semiconductor ASA.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/soc/arm/arm/Kconfig b/soc/arm/arm/Kconfig
index 6245354..de5b5d5 100644
--- a/soc/arm/arm/Kconfig
+++ b/soc/arm/arm/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - ARM LTD SoC configuration options
-#
+# ARM LTD SoC configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_ARM
 	bool
diff --git a/soc/arm/arm/Kconfig.defconfig b/soc/arm/arm/Kconfig.defconfig
index 9bf483f..54abe04 100644
--- a/soc/arm/arm/Kconfig.defconfig
+++ b/soc/arm/arm/Kconfig.defconfig
@@ -1,8 +1,6 @@
-# Kconfig - ARM LTD SoC configuration options
-#
+# ARM LTD SoC configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/arm/*/Kconfig.defconfig.series"
diff --git a/soc/arm/arm/Kconfig.soc b/soc/arm/arm/Kconfig.soc
index 7b93e8e..60ee858 100644
--- a/soc/arm/arm/Kconfig.soc
+++ b/soc/arm/arm/Kconfig.soc
@@ -1,8 +1,6 @@
-# Kconfig - ARM LTD SoC configuration options
-#
+# ARM LTD SoC configuration options
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/arm/*/Kconfig.series"
diff --git a/soc/arm/arm/beetle/Kconfig.defconfig.beetle_r0 b/soc/arm/arm/beetle/Kconfig.defconfig.beetle_r0
index bd38d92..80349d6 100644
--- a/soc/arm/arm/beetle/Kconfig.defconfig.beetle_r0
+++ b/soc/arm/arm/beetle/Kconfig.defconfig.beetle_r0
@@ -1,10 +1,7 @@
-# Kconfig - ARM LTD Beetle SoC configuration options
+# ARM LTD Beetle SoC configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_BEETLE_R0
 
diff --git a/soc/arm/arm/beetle/Kconfig.defconfig.series b/soc/arm/arm/beetle/Kconfig.defconfig.series
index ec5207f..9fcaf98 100644
--- a/soc/arm/arm/beetle/Kconfig.defconfig.series
+++ b/soc/arm/arm/beetle/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - ARM LTD Beetle SoC configuration options
+# ARM LTD Beetle SoC configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_BEETLE
 
diff --git a/soc/arm/arm/beetle/Kconfig.series b/soc/arm/arm/beetle/Kconfig.series
index 621e251..541d5a5 100644
--- a/soc/arm/arm/beetle/Kconfig.series
+++ b/soc/arm/arm/beetle/Kconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - ARM LTD Beetle SoC configuration options
+# ARM LTD Beetle SoC configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_BEETLE
 	bool "ARM Beetle MCU Series"
diff --git a/soc/arm/arm/beetle/Kconfig.soc b/soc/arm/arm/beetle/Kconfig.soc
index 70438fc..e577ee7 100644
--- a/soc/arm/arm/beetle/Kconfig.soc
+++ b/soc/arm/arm/beetle/Kconfig.soc
@@ -1,10 +1,7 @@
-# Kconfig - ARM LTD Beetle SoC configuration options
+# ARM LTD Beetle SoC configuration options
 
-#
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "ARM Beetle SoC"
diff --git a/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an385 b/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an385
index 42c61b9..3f0e09b 100644
--- a/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an385
+++ b/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an385
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MPS2_AN385
 
diff --git a/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an521 b/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an521
index b828f4d..a4bd9ae 100644
--- a/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an521
+++ b/soc/arm/arm/mps2/Kconfig.defconfig.mps2_an521
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018-2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MPS2_AN521
 
diff --git a/soc/arm/arm/mps2/Kconfig.defconfig.series b/soc/arm/arm/mps2/Kconfig.defconfig.series
index d61740d..6223427 100644
--- a/soc/arm/arm/mps2/Kconfig.defconfig.series
+++ b/soc/arm/arm/mps2/Kconfig.defconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_MPS2
 
diff --git a/soc/arm/arm/mps2/Kconfig.series b/soc/arm/arm/mps2/Kconfig.series
index 48486ed..eb547a5 100644
--- a/soc/arm/arm/mps2/Kconfig.series
+++ b/soc/arm/arm/mps2/Kconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_MPS2
 	bool "ARM MPS2 MCU Series"
diff --git a/soc/arm/arm/mps2/Kconfig.soc b/soc/arm/arm/mps2/Kconfig.soc
index 7771694..20ac856 100644
--- a/soc/arm/arm/mps2/Kconfig.soc
+++ b/soc/arm/arm/mps2/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017-2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "ARM MPS2 SoCs"
diff --git a/soc/arm/arm/musca_a/Kconfig.defconfig.musca_a b/soc/arm/arm/musca_a/Kconfig.defconfig.musca_a
index 60b4df3..e8ff756 100644
--- a/soc/arm/arm/musca_a/Kconfig.defconfig.musca_a
+++ b/soc/arm/arm/musca_a/Kconfig.defconfig.musca_a
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_V2M_MUSCA_A
 
diff --git a/soc/arm/arm/musca_a/Kconfig.defconfig.series b/soc/arm/arm/musca_a/Kconfig.defconfig.series
index 1692510..1248da9 100644
--- a/soc/arm/arm/musca_a/Kconfig.defconfig.series
+++ b/soc/arm/arm/musca_a/Kconfig.defconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_MUSCA
 
diff --git a/soc/arm/arm/musca_a/Kconfig.series b/soc/arm/arm/musca_a/Kconfig.series
index e438fad..c8b4cf2 100644
--- a/soc/arm/arm/musca_a/Kconfig.series
+++ b/soc/arm/arm/musca_a/Kconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_MUSCA
 	bool "ARM v2m MUSCA MCU Series"
diff --git a/soc/arm/arm/musca_a/Kconfig.soc b/soc/arm/arm/musca_a/Kconfig.soc
index e65685d..523da29 100644
--- a/soc/arm/arm/musca_a/Kconfig.soc
+++ b/soc/arm/arm/musca_a/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "ARM Musca SoCs"
diff --git a/soc/arm/arm/musca_b1/Kconfig.defconfig.musca_b1 b/soc/arm/arm/musca_b1/Kconfig.defconfig.musca_b1
index 2f8ce40..59fac25 100644
--- a/soc/arm/arm/musca_b1/Kconfig.defconfig.musca_b1
+++ b/soc/arm/arm/musca_b1/Kconfig.defconfig.musca_b1
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_V2M_MUSCA_B1
 
diff --git a/soc/arm/arm/musca_b1/Kconfig.defconfig.series b/soc/arm/arm/musca_b1/Kconfig.defconfig.series
index fa6253d..356f945 100644
--- a/soc/arm/arm/musca_b1/Kconfig.defconfig.series
+++ b/soc/arm/arm/musca_b1/Kconfig.defconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_MUSCA_B1
 
diff --git a/soc/arm/arm/musca_b1/Kconfig.series b/soc/arm/arm/musca_b1/Kconfig.series
index b353f40..d4c05f1 100644
--- a/soc/arm/arm/musca_b1/Kconfig.series
+++ b/soc/arm/arm/musca_b1/Kconfig.series
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_MUSCA_B1
 	bool "arm v2m MUSCA B1 MCU Series"
diff --git a/soc/arm/arm/musca_b1/Kconfig.soc b/soc/arm/arm/musca_b1/Kconfig.soc
index 5a6b00c..1f8428a 100644
--- a/soc/arm/arm/musca_b1/Kconfig.soc
+++ b/soc/arm/arm/musca_b1/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "ARM Musca B1 SoCs"
diff --git a/soc/arm/atmel_sam/Kconfig b/soc/arm/atmel_sam/Kconfig
index 29dd618..c4eab60 100644
--- a/soc/arm/atmel_sam/Kconfig
+++ b/soc/arm/atmel_sam/Kconfig
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM MCU family configuration options
-#
+# Atmel SAM MCU family configuration options
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam/Kconfig.defconfig b/soc/arm/atmel_sam/Kconfig.defconfig
index ec3e5b6..c211dbb 100644
--- a/soc/arm/atmel_sam/Kconfig.defconfig
+++ b/soc/arm/atmel_sam/Kconfig.defconfig
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM MCU family default configuration options
-#
+# Atmel SAM MCU family default configuration options
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/atmel_sam/*/Kconfig.defconfig.series"
 
diff --git a/soc/arm/atmel_sam/Kconfig.soc b/soc/arm/atmel_sam/Kconfig.soc
index 2878641..688cd65 100644
--- a/soc/arm/atmel_sam/Kconfig.soc
+++ b/soc/arm/atmel_sam/Kconfig.soc
@@ -1,7 +1,6 @@
-# Kconfig - Atmel SAM MCU series selection
-#
+# Atmel SAM MCU series selection
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/atmel_sam/*/Kconfig.series"
diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.defconfig.series b/soc/arm/atmel_sam/sam3x/Kconfig.defconfig.series
index 43ec071..a9d58a5 100644
--- a/soc/arm/atmel_sam/sam3x/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam/sam3x/Kconfig.defconfig.series
@@ -1,10 +1,9 @@
-# Kconfig - Atmel SAM3X MCU series configuration options
-#
+# Atmel SAM3X MCU series configuration options
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2016 Intel Corporation.
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_SAM3X
 
diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.series b/soc/arm/atmel_sam/sam3x/Kconfig.series
index de2935f..9f179c4 100644
--- a/soc/arm/atmel_sam/sam3x/Kconfig.series
+++ b/soc/arm/atmel_sam/sam3x/Kconfig.series
@@ -1,10 +1,9 @@
-# Kconfig - Atmel SAM3X MCU series
-#
+# Atmel SAM3X MCU series
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2016 Intel Corporation.
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_SAM3X
 	bool "Atmel SAM3X MCU"
diff --git a/soc/arm/atmel_sam/sam3x/Kconfig.soc b/soc/arm/atmel_sam/sam3x/Kconfig.soc
index 4f04050..1e9a203 100644
--- a/soc/arm/atmel_sam/sam3x/Kconfig.soc
+++ b/soc/arm/atmel_sam/sam3x/Kconfig.soc
@@ -1,11 +1,9 @@
-# Kconfig - Atmel SAM3X MCU series
-#
+# Atmel SAM3X MCU series
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2016 Intel Corporation.
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Atmel SAM3X MCU Selection"
diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.defconfig.series b/soc/arm/atmel_sam/sam4s/Kconfig.defconfig.series
index 2518abb..c7e6ebb 100644
--- a/soc/arm/atmel_sam/sam4s/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam/sam4s/Kconfig.defconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - Atmel SAM4S MCU series configuration options
-#
+# Atmel SAM4S MCU series configuration options
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2018 Vincent van der Locht
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_SAM4S
 
diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.series b/soc/arm/atmel_sam/sam4s/Kconfig.series
index 595c695..696afd9 100644
--- a/soc/arm/atmel_sam/sam4s/Kconfig.series
+++ b/soc/arm/atmel_sam/sam4s/Kconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - Atmel SAM4S MCU series
-#
+# Atmel SAM4S MCU series
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2018 Vincent van der Locht
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_SAM4S
 	bool "Atmel SAM4S MCU"
diff --git a/soc/arm/atmel_sam/sam4s/Kconfig.soc b/soc/arm/atmel_sam/sam4s/Kconfig.soc
index 8674c92..6ad8fe3 100644
--- a/soc/arm/atmel_sam/sam4s/Kconfig.soc
+++ b/soc/arm/atmel_sam/sam4s/Kconfig.soc
@@ -1,10 +1,8 @@
-# Kconfig - Atmel SAM4S MCU series
-#
+# Atmel SAM4S MCU series
+
 # Copyright (c) 2017 Justin Watson
 # Copyright (c) 2018 Vincent van der Locht
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Atmel SAM4S MCU Selection"
diff --git a/soc/arm/atmel_sam/same70/Kconfig.defconfig.series b/soc/arm/atmel_sam/same70/Kconfig.defconfig.series
index 2dd9ea5..3c93748 100644
--- a/soc/arm/atmel_sam/same70/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam/same70/Kconfig.defconfig.series
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM E70 MCU series configuration options
-#
+# Atmel SAM E70 MCU series configuration options
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_SAME70
 
diff --git a/soc/arm/atmel_sam/same70/Kconfig.series b/soc/arm/atmel_sam/same70/Kconfig.series
index afce7c7..d3c8ea2 100644
--- a/soc/arm/atmel_sam/same70/Kconfig.series
+++ b/soc/arm/atmel_sam/same70/Kconfig.series
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM E70 MCU series
-#
+# Atmel SAM E70 MCU series
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_SAME70
 	bool "Atmel SAME70 MCU"
diff --git a/soc/arm/atmel_sam/same70/Kconfig.soc b/soc/arm/atmel_sam/same70/Kconfig.soc
index 14b1347..66e088e 100644
--- a/soc/arm/atmel_sam/same70/Kconfig.soc
+++ b/soc/arm/atmel_sam/same70/Kconfig.soc
@@ -1,8 +1,7 @@
-# Kconfig - Atmel SAM E70 MCU series
-#
+# Atmel SAM E70 MCU series
+
 # Copyright (c) 2016 Piotr Mienkowski
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Atmel SAME70 MCU Selection"
diff --git a/soc/arm/atmel_sam0/Kconfig b/soc/arm/atmel_sam0/Kconfig
index bb99398..32f6776 100644
--- a/soc/arm/atmel_sam0/Kconfig
+++ b/soc/arm/atmel_sam0/Kconfig
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 MCU family configuration options
-#
+# Atmel SAM0 MCU family configuration options
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/Kconfig.defconfig b/soc/arm/atmel_sam0/Kconfig.defconfig
index 7c29a9c..0569ef9 100644
--- a/soc/arm/atmel_sam0/Kconfig.defconfig
+++ b/soc/arm/atmel_sam0/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 MCU family default configuration options
-#
+# Atmel SAM0 MCU family default configuration options
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/Kconfig.soc b/soc/arm/atmel_sam0/Kconfig.soc
index 64e1df0..8e81395 100644
--- a/soc/arm/atmel_sam0/Kconfig.soc
+++ b/soc/arm/atmel_sam0/Kconfig.soc
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAM0 MCU series selection
-#
+# Atmel SAM0 MCU series selection
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.defconfig.series b/soc/arm/atmel_sam0/samd20/Kconfig.defconfig.series
index 76950e0..f08047a 100644
--- a/soc/arm/atmel_sam0/samd20/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam0/samd20/Kconfig.defconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD MCU series configuration options
-#
+# Atmel SAMD MCU series configuration options
+
 # Copyright (c) 2018 Sean Nyekjaer
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.series b/soc/arm/atmel_sam0/samd20/Kconfig.series
index f2461f2..9293472 100644
--- a/soc/arm/atmel_sam0/samd20/Kconfig.series
+++ b/soc/arm/atmel_sam0/samd20/Kconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD20 MCU series
-#
+# Atmel SAMD20 MCU series
+
 # Copyright (c) 2018 Sean Nyekjaer
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd20/Kconfig.soc b/soc/arm/atmel_sam0/samd20/Kconfig.soc
index 96dcc63..6cfc12f 100644
--- a/soc/arm/atmel_sam0/samd20/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samd20/Kconfig.soc
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD MCU series
-#
+# Atmel SAMD MCU series
+
 # Copyright (c) 2018 Sean Nyekjaer
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.defconfig.series b/soc/arm/atmel_sam0/samd21/Kconfig.defconfig.series
index 987e045..6854e8c 100644
--- a/soc/arm/atmel_sam0/samd21/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam0/samd21/Kconfig.defconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD MCU series configuration options
-#
+# Atmel SAMD MCU series configuration options
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.series b/soc/arm/atmel_sam0/samd21/Kconfig.series
index 242a99d..2d18c03 100644
--- a/soc/arm/atmel_sam0/samd21/Kconfig.series
+++ b/soc/arm/atmel_sam0/samd21/Kconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD21 MCU series
-#
+# Atmel SAMD21 MCU series
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samd21/Kconfig.soc b/soc/arm/atmel_sam0/samd21/Kconfig.soc
index 2ae909a..51ffa5d 100644
--- a/soc/arm/atmel_sam0/samd21/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samd21/Kconfig.soc
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMD MCU series
-#
+# Atmel SAMD MCU series
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.defconfig.series b/soc/arm/atmel_sam0/samr21/Kconfig.defconfig.series
index 3f54a68..de04abe 100644
--- a/soc/arm/atmel_sam0/samr21/Kconfig.defconfig.series
+++ b/soc/arm/atmel_sam0/samr21/Kconfig.defconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMR21 MCU series configuration options
-#
+# Atmel SAMR21 MCU series configuration options
+
 # Copyright (c) 2019 Benjamin Valentin
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.series b/soc/arm/atmel_sam0/samr21/Kconfig.series
index 5336e0e..28c59d9 100644
--- a/soc/arm/atmel_sam0/samr21/Kconfig.series
+++ b/soc/arm/atmel_sam0/samr21/Kconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMR21 MCU series
-#
+# Atmel SAMR21 MCU series
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/atmel_sam0/samr21/Kconfig.soc b/soc/arm/atmel_sam0/samr21/Kconfig.soc
index d4e7dc6..98fb278 100644
--- a/soc/arm/atmel_sam0/samr21/Kconfig.soc
+++ b/soc/arm/atmel_sam0/samr21/Kconfig.soc
@@ -1,5 +1,5 @@
-# Kconfig - Atmel SAMR21 MCU series
-#
+# Atmel SAMR21 MCU series
+
 # Copyright (c) 2017 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/arm/cypress/Kconfig b/soc/arm/cypress/Kconfig
index f02e6d4..d0614b7 100644
--- a/soc/arm/cypress/Kconfig
+++ b/soc/arm/cypress/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Cypress PSoC6 MCU Selection"
diff --git a/soc/arm/cypress/Kconfig.defconfig b/soc/arm/cypress/Kconfig.defconfig
index 553078e..74310b9 100644
--- a/soc/arm/cypress/Kconfig.defconfig
+++ b/soc/arm/cypress/Kconfig.defconfig
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/cypress/*/Kconfig.defconfig.series"
diff --git a/soc/arm/cypress/Kconfig.soc b/soc/arm/cypress/Kconfig.soc
index fefe5f8..04e3e20 100644
--- a/soc/arm/cypress/Kconfig.soc
+++ b/soc/arm/cypress/Kconfig.soc
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/cypress/*/Kconfig.series"
diff --git a/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m0 b/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m0
index ad344c2..36de65c 100644
--- a/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m0
+++ b/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m0
@@ -1,9 +1,7 @@
-# Kconfig - Cypress PSoC6 CM0 platform configuration options
-#
+# Cypress PSoC6 CM0 platform configuration options
+
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_PSOC6_M0
 
diff --git a/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m4 b/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m4
index 99ffcd2..6b2b0df 100644
--- a/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m4
+++ b/soc/arm/cypress/psoc6/Kconfig.defconfig.psoc6_m4
@@ -1,9 +1,7 @@
-# Kconfig - Cypress PSoC6 CM4 platform configuration options
-#
+# Cypress PSoC6 CM4 platform configuration options
+
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_PSOC6_M4
 
diff --git a/soc/arm/cypress/psoc6/Kconfig.defconfig.series b/soc/arm/cypress/psoc6/Kconfig.defconfig.series
index ff4677c..a64338d 100644
--- a/soc/arm/cypress/psoc6/Kconfig.defconfig.series
+++ b/soc/arm/cypress/psoc6/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.series - Cypress Semiconductor PSoC6 series configuration
-# options
-#
+# Cypress Semiconductor PSoC6 series configuration options
+
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_PSOC62
 
diff --git a/soc/arm/cypress/psoc6/Kconfig.series b/soc/arm/cypress/psoc6/Kconfig.series
index e9bee50..f437c83 100644
--- a/soc/arm/cypress/psoc6/Kconfig.series
+++ b/soc/arm/cypress/psoc6/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.series - Cypress PSoC6 MCU line
-#
+# Cypress PSoC6 MCU line
+
 # Copyright (c) 2018, Cypress Semiconductor
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_PSOC62
 	bool "Cypress PSoC6 series MCU"
diff --git a/soc/arm/cypress/psoc6/Kconfig.soc b/soc/arm/cypress/psoc6/Kconfig.soc
index 06a27b2..a3e34db 100644
--- a/soc/arm/cypress/psoc6/Kconfig.soc
+++ b/soc/arm/cypress/psoc6/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - Cypress PSOC6 MCU line
-#
+# Cypress PSOC6 MCU line
+
 # Copyright (c) 2018, Cypress
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Cypress PSoC6 MCU Selection"
diff --git a/soc/arm/microchip_mec/Kconfig b/soc/arm/microchip_mec/Kconfig
index bfe2f99..e7b5d64 100644
--- a/soc/arm/microchip_mec/Kconfig
+++ b/soc/arm/microchip_mec/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - Microchip MEC MCU line
+# Microchip MEC MCU line
 
 # Copyright (c) 2018, Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
diff --git a/soc/arm/microchip_mec/Kconfig.soc b/soc/arm/microchip_mec/Kconfig.soc
index a8ab0dd..295434b 100644
--- a/soc/arm/microchip_mec/Kconfig.soc
+++ b/soc/arm/microchip_mec/Kconfig.soc
@@ -1,8 +1,6 @@
-# Kconfig.soc - Microchip MEC1701 MCU line
-#
+# Microchip MEC1701 MCU line
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/microchip_mec/*/Kconfig.series"
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz b/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz
index 3918625..2592230 100644
--- a/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz
+++ b/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501hsz
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC1501HSZ MCU
-#
+# Microchip MEC1501HSZ MCU
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MEC1501_HSZ
 
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.series b/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.series
index 7e36dfc..86004b8 100644
--- a/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.series
+++ b/soc/arm/microchip_mec/mec1501/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC MCU series configuration options
-#
+# Microchip MEC MCU series configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_MEC1501X
 
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.series b/soc/arm/microchip_mec/mec1501/Kconfig.series
index 92c1590..1abdd1b 100644
--- a/soc/arm/microchip_mec/mec1501/Kconfig.series
+++ b/soc/arm/microchip_mec/mec1501/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC1501 MCU core series
-#
+# Microchip MEC1501 MCU core series
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_MEC1501X
 	bool "Microchip MEC1501X Series"
diff --git a/soc/arm/microchip_mec/mec1501/Kconfig.soc b/soc/arm/microchip_mec/mec1501/Kconfig.soc
index 77c5d3c..ade3a94 100644
--- a/soc/arm/microchip_mec/mec1501/Kconfig.soc
+++ b/soc/arm/microchip_mec/mec1501/Kconfig.soc
@@ -1,10 +1,7 @@
-# Kconfig - Microchip MEC1501 MCU core series
+# Microchip MEC1501 MCU core series
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "MEC1501 Selection"
diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.mec1701qsz b/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.mec1701qsz
index 6a8483e..b61c181 100644
--- a/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.mec1701qsz
+++ b/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.mec1701qsz
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC1701QSZ MCU
-#
+# Microchip MEC1701QSZ MCU
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MEC1701_QSZ
 
diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.series b/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.series
index af26eb4..46bbdda 100644
--- a/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.series
+++ b/soc/arm/microchip_mec/mec1701/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC MCU series configuration options
-#
+# Microchip MEC MCU series configuration options
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_MEC1701X
 
diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.series b/soc/arm/microchip_mec/mec1701/Kconfig.series
index 482c168..8a63041 100644
--- a/soc/arm/microchip_mec/mec1701/Kconfig.series
+++ b/soc/arm/microchip_mec/mec1701/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Microchip MEC1701 MCU core series
-#
+# Microchip MEC1701 MCU core series
+
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_MEC1701X
 	bool "Microchip MEC1701X Series"
diff --git a/soc/arm/microchip_mec/mec1701/Kconfig.soc b/soc/arm/microchip_mec/mec1701/Kconfig.soc
index 92afb13..9464f49 100644
--- a/soc/arm/microchip_mec/mec1701/Kconfig.soc
+++ b/soc/arm/microchip_mec/mec1701/Kconfig.soc
@@ -1,10 +1,7 @@
-# Kconfig - Microchip MEC1701 MCU core series
+# Microchip MEC1701 MCU core series
 
-#
 # Copyright (c) 2018 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "MEC1701 Selection"
diff --git a/soc/arm/nordic_nrf/Kconfig b/soc/arm/nordic_nrf/Kconfig
index b7e91cd..e24c483 100644
--- a/soc/arm/nordic_nrf/Kconfig
+++ b/soc/arm/nordic_nrf/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - Nordic Semiconductor nRFx MCU line
+# Nordic Semiconductor nRFx MCU line
 
 # Copyright (c) 2016-2018 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
diff --git a/soc/arm/nordic_nrf/Kconfig.defconfig b/soc/arm/nordic_nrf/Kconfig.defconfig
index 0657f80..93ae1e9 100644
--- a/soc/arm/nordic_nrf/Kconfig.defconfig
+++ b/soc/arm/nordic_nrf/Kconfig.defconfig
@@ -1,9 +1,7 @@
-# Kconfig.defconfig - Nordic Semiconductor nRFx MCU line
-#
+# Nordic Semiconductor nRFx MCU line
+
 # Copyright (c) 2016-2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_FAMILY_NRF
 
diff --git a/soc/arm/nordic_nrf/Kconfig.peripherals b/soc/arm/nordic_nrf/Kconfig.peripherals
index 38ae8ea..52c0ec0 100644
--- a/soc/arm/nordic_nrf/Kconfig.peripherals
+++ b/soc/arm/nordic_nrf/Kconfig.peripherals
@@ -1,9 +1,7 @@
-# Kconfig.peripherals - Nordic Semiconductor nRFx MCU peripherals list.
-#
+# Nordic Semiconductor nRFx MCU peripherals list.
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_HW_NRF_ACL
 	bool
diff --git a/soc/arm/nordic_nrf/Kconfig.soc b/soc/arm/nordic_nrf/Kconfig.soc
index c3727d6..1eda729 100644
--- a/soc/arm/nordic_nrf/Kconfig.soc
+++ b/soc/arm/nordic_nrf/Kconfig.soc
@@ -1,8 +1,6 @@
-# Kconfig.soc - Nordic Semiconductor nRFx MCU line
-#
+# Nordic Semiconductor nRFx MCU line
+
 # Copyright (c) 2016-2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nordic_nrf/*/Kconfig.series"
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA
index dc44a15..311dab6 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAA
@@ -1,10 +1,8 @@
-# Kconfig.defconfig.nrf51822_QFAA - Nordic Semiconductor nRF51822 MCU
-#
+# Nordic Semiconductor nRF51822 MCU
+
 # Copyright (c) 2016 Linaro Limited
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NRF51822_QFAA
 
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB
index 9cdf529..68990ab 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAB
@@ -1,10 +1,8 @@
-# Kconfig.defconfig.nrf51822_QFAB - Nordic Semiconductor nRF51822 MCU
-#
+# Nordic Semiconductor nRF51822 MCU
+
 # Copyright (c) 2016 Linaro Limited
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NRF51822_QFAB
 
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC
index 6657574..83c0d3d 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.nrf51822_QFAC
@@ -1,10 +1,8 @@
-# Kconfig.defconfig.nrf51822_QFAC - Nordic Semiconductor nRF51822 MCU
-#
+# Nordic Semiconductor nRF51822 MCU
+
 # Copyright (c) 2016 Linaro Limited
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_NRF51822_QFAC
 
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series
index 0720099..fb9999f 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.defconfig.series
@@ -1,10 +1,8 @@
-# Kconfig.defconfig.series - Nordic Semiconductor nRF51 MCU line
-#
+# Nordic Semiconductor nRF51 MCU line
+
 # Copyright (c) 2016 Linaro Limited
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_NRF51X
 
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.series b/soc/arm/nordic_nrf/nrf51/Kconfig.series
index aaad0cd..75c58a7 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.series
@@ -1,10 +1,8 @@
-# Kconfig.series - Nordic Semiconductor nRF51 MCU line
-#
+# Nordic Semiconductor nRF51 MCU line
+
 # Copyright (c) 2016 Linaro Limited
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config  SOC_SERIES_NRF51X
 	bool "Nordic Semiconductor nRF51 series MCU"
diff --git a/soc/arm/nordic_nrf/nrf51/Kconfig.soc b/soc/arm/nordic_nrf/nrf51/Kconfig.soc
index c14bc12..1edee9b 100644
--- a/soc/arm/nordic_nrf/nrf51/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf51/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - Nordic Semiconductor nRF51 MCU line
-#
+# Nordic Semiconductor nRF51 MCU line
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "nRF51x MCU Selection"
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52810_QFAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52810_QFAA
index 27d77dd..1b5a7b5 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52810_QFAA
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52810_QFAA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52810 - Nordic Semiconductor nRF52810 MCU
-#
-# Copyright (c) 2018 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52810 MCU
 
+# Copyright (c) 2018 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52810_QFAA
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA
index b55e663..7b29130 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52811_QFAA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52811 - Nordic Semiconductor nRF52811 MCU
-#
-# Copyright (c) 2019 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52811 MCU
 
+# Copyright (c) 2019 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52811_QFAA
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_CIAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_CIAA
index cb1bfbd..72e192f 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_CIAA
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_CIAA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52832 - Nordic Semiconductor nRF52832 MCU
-#
-# Copyright (c) 2019 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52832 MCU
 
+# Copyright (c) 2019 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52832_CIAA
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA
index 947c01f..94c1032 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52832 - Nordic Semiconductor nRF52832 MCU
-#
-# Copyright (c) 2016 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52832 MCU
 
+# Copyright (c) 2016 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52832_QFAA
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAB b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAB
index dfde448..67abf70 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAB
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52832_QFAB
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52832 - Nordic Semiconductor nRF52832 MCU
-#
-# Copyright (c) 2019 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52832 MCU
 
+# Copyright (c) 2019 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52832_QFAB
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA
index 9b576bc..5333bbe 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52840_QIAA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf52840 - Nordic Semiconductor nRF52840 MCU
-#
-# Copyright (c) 2016 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF52840 MCU
 
+# Copyright (c) 2016 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF52840_QIAA
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series
index 8fa228a..cc3197b 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - Nordic Semiconductor nRF52 MCU line
-#
+# Nordic Semiconductor nRF52 MCU line
+
 # Copyright (c) 2016-2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_NRF52X
 
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.series b/soc/arm/nordic_nrf/nrf52/Kconfig.series
index 56d2357..c9e04fb 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.series - Nordic Semiconductor nRF52 MCU line
-#
+# Nordic Semiconductor nRF52 MCU line
+
 # Copyright (c) 2016-2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config  SOC_SERIES_NRF52X
 	bool "Nordic Semiconductor nRF52 series MCU"
diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.soc b/soc/arm/nordic_nrf/nrf52/Kconfig.soc
index ff0e664..744c893 100644
--- a/soc/arm/nordic_nrf/nrf52/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf52/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - Nordic Semiconductor nRF52 MCU line
-#
+# Nordic Semiconductor nRF52 MCU line
+
 # Copyright (c) 2016-2019 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_NRF52810
 	depends on SOC_SERIES_NRF52X
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9160_SICA b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9160_SICA
index 328041a..e844084 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9160_SICA
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9160_SICA
@@ -1,10 +1,7 @@
-# Kconfig.defconfig.nrf9160 - Nordic Semiconductor nRF9160 MCU
-#
-# Copyright (c) 2018 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Nordic Semiconductor nRF9160 MCU
 
+# Copyright (c) 2018 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_NRF9160_SICA
 
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.series
index 07a291b..9612555 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.series
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - Nordic Semiconductor nRF91 MCU line
-#
+# Nordic Semiconductor nRF91 MCU line
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_NRF91X
 
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.series b/soc/arm/nordic_nrf/nrf91/Kconfig.series
index f8500d2..ce056c4 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.series
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.series - Nordic Semiconductor nRF91 MCU line
-#
+# Nordic Semiconductor nRF91 MCU line
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config  SOC_SERIES_NRF91X
 	bool "Nordic Semiconductor nRF91 series MCU"
diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.soc b/soc/arm/nordic_nrf/nrf91/Kconfig.soc
index 11b5258..ab954bb 100644
--- a/soc/arm/nordic_nrf/nrf91/Kconfig.soc
+++ b/soc/arm/nordic_nrf/nrf91/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - Nordic Semiconductor nRF91 MCU line
-#
+# Nordic Semiconductor nRF91 MCU line
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_NRF9160
 	depends on SOC_SERIES_NRF91X
diff --git a/soc/arm/nxp_imx/Kconfig.defconfig b/soc/arm/nxp_imx/Kconfig.defconfig
index 62a499e..e9ac945 100644
--- a/soc/arm/nxp_imx/Kconfig.defconfig
+++ b/soc/arm/nxp_imx/Kconfig.defconfig
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nxp_imx/*/Kconfig.defconfig.series"
diff --git a/soc/arm/nxp_imx/Kconfig.soc b/soc/arm/nxp_imx/Kconfig.soc
index db3a90e..ccc5b2d 100644
--- a/soc/arm/nxp_imx/Kconfig.soc
+++ b/soc/arm/nxp_imx/Kconfig.soc
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nxp_imx/*/Kconfig.series"
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4 b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4
index 8a5ab30..ef6856e 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4
+++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.mcimx6x_m4
@@ -1,9 +1,7 @@
-# Kconfig - i.MX 6SoloX
-#
+# i.MX 6SoloX
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MCIMX6X_M4
 
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.series b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.series
index a179e81..cd099ab 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.series
+++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - i.MX 6SoloX M4 core series
-#
+# i.MX 6SoloX M4 core series
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_IMX_6X_M4
 
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series
index dedea83..66bb6da 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series
+++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - i.MX 6SoloX M4 core series
-#
+# i.MX 6SoloX M4 core series
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_IMX_6X_M4
 	bool "i.MX 6SoloX M4 Core Series"
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
index fa36d4c..ee7c725 100644
--- a/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
+++ b/soc/arm/nxp_imx/mcimx6x_m4/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - i.MX 6SoloX M4 core series
-#
+# i.MX 6SoloX M4 core series
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "i.MX 6SoloX Selection"
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4 b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4
index 1a1f058..7081832 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4
+++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.mcimx7_m4
@@ -1,9 +1,7 @@
-# Kconfig - iMX7 M4 core series
-#
+# iMX7 M4 core series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MCIMX7_M4
 
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.series b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.series
index 0cae539..9a768b5 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.series
+++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - iMX7 M4 core series
-#
+# iMX7 M4 core series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_IMX7_M4
 
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series
index 3565ffb..2d87f47 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series
+++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - iMX7 M4 core series
-#
+# iMX7 M4 core series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_IMX7_M4
 	bool "i.MX7 M4 Core Series"
diff --git a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
index 35184e1..a65d91d 100644
--- a/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
+++ b/soc/arm/nxp_imx/mcimx7_m4/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - iMX7 M4 core series
-#
+# iMX7 M4 core series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "i.MX7 M4 Selection"
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1015 b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1015
index 30cc6b4..2ef7f72 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1015
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1015
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT1015
-#
+# i.MX RT1015
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MIMXRT1015
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1021 b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1021
index 0f7cb70..2d694e8 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1021
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1021
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT1021
-#
+# i.MX RT1021
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MIMXRT1021
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1052 b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1052
index 98556ec..35f0a49 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1052
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1052
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT1052
-#
+# i.MX RT1052
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MIMXRT1052
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1062 b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1062
index 45d684f..b050dc3 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1062
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1062
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT1062
-#
+# i.MX RT1062
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MIMXRT1062
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1064 b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1064
index 6716f9e..4b0d1b0 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1064
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt1064
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT1064
-#
+# i.MX RT1064
+
 # Copyright (c) 2018, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MIMXRT1064
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series
index 27ae4c5..6c5bad8 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series
+++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT series
-#
+# i.MX RT series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_IMX_RT
 
diff --git a/soc/arm/nxp_imx/rt/Kconfig.series b/soc/arm/nxp_imx/rt/Kconfig.series
index b0054f2..bd4197e 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.series
+++ b/soc/arm/nxp_imx/rt/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - iMX RT series
-#
+# iMX RT series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_IMX_RT
 	bool "i.MX RT Series"
diff --git a/soc/arm/nxp_imx/rt/Kconfig.soc b/soc/arm/nxp_imx/rt/Kconfig.soc
index ac56f12..1fcae59 100644
--- a/soc/arm/nxp_imx/rt/Kconfig.soc
+++ b/soc/arm/nxp_imx/rt/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - i.MX RT series
-#
+# i.MX RT series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "i.MX RT Selection"
diff --git a/soc/arm/nxp_kinetis/Kconfig b/soc/arm/nxp_kinetis/Kconfig
index 65586f9..0d0484a 100644
--- a/soc/arm/nxp_kinetis/Kconfig
+++ b/soc/arm/nxp_kinetis/Kconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2016 Intel Corporation
 # Copyright (c) 2016, Freescale Semiconductor, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_KINETIS
 	bool
diff --git a/soc/arm/nxp_kinetis/Kconfig.soc b/soc/arm/nxp_kinetis/Kconfig.soc
index 32d7f40..0a20726 100644
--- a/soc/arm/nxp_kinetis/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/Kconfig.soc
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nxp_kinetis/*/Kconfig.series"
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
index 39e6f53..19c3479 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
@@ -1,9 +1,7 @@
-# Kconfig - FSL FRDM K22F platform configuration options
-#
+# FSL FRDM K22F platform configuration options
+
 # Copyright (c) 2018 Prevas A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MK22F51212
 
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.series
index 33ed0e5..4cec664 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Kinetis K2x series configuration options
-#
+# Kinetis K2x series configuration options
+
 # Copyright (c) 2018 Prevas A/S
 # Copyright (c) 2019 Thomas Burdick <thomas.burdick@gmail.com>
 
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.series b/soc/arm/nxp_kinetis/k2x/Kconfig.series
index 34fde8b..cdadb61 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.series
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.series
@@ -1,5 +1,5 @@
-# Kconfig - Kinetis K2X MCU line
-#
+# Kinetis K2X MCU line
+
 # Copyright (c) 2018 Prevas A/S
 # Copyright (c) 2019 Thomas Burdick <thomas.burdick@gmail.com>
 
diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.soc b/soc/arm/nxp_kinetis/k2x/Kconfig.soc
index 64dc135..fb277a8 100644
--- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc
@@ -1,5 +1,5 @@
-# Kconfig - Kinetis K2X MCU line
-#
+# Kinetis K2X MCU line
+
 # Copyright (c) 2018 Prevas A/S
 # Copyright (c) 2019 Thomas Burdick <thomas.burdick@gmail.com>
 
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
index 6de43ec..a6df08a 100644
--- a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
+++ b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
@@ -1,10 +1,7 @@
-# Kconfig - FSL FRDM K64F platform configuration options
+# FSL FRDM K64F platform configuration options
 
-#
 # Copyright (c) 2014-2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MK64F12
 
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.series
index 7196d63..e4c81f3 100644
--- a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - Kinetis K6x series configuration options
+# Kinetis K6x series configuration options
 
-#
 # Copyright (c) 2014-2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_KINETIS_K6X
 
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.series b/soc/arm/nxp_kinetis/k6x/Kconfig.series
index cf2e65f..deb5886 100644
--- a/soc/arm/nxp_kinetis/k6x/Kconfig.series
+++ b/soc/arm/nxp_kinetis/k6x/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K6X MCU line
-#
+# Kinetis K6X MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_KINETIS_K6X
 	bool "Kinetis K6x Series MCU"
diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.soc b/soc/arm/nxp_kinetis/k6x/Kconfig.soc
index 36a383d..1dc7ac6 100644
--- a/soc/arm/nxp_kinetis/k6x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k6x/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K6X MCU line
-#
+# Kinetis K6X MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Kinetis K6x MCU Selection"
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk80f25615 b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk80f25615
index 1880f03..cda49ed 100644
--- a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk80f25615
+++ b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk80f25615
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K80F25615 configuration options
-#
+# Kinetis K80F25615 configuration options
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MK80F25615
 
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk82f25615 b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk82f25615
index 0b35eb8..3982109 100644
--- a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk82f25615
+++ b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.mk82f25615
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K82F25615 configuration options
-#
+# Kinetis K82F25615 configuration options
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MK82F25615
 
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
index 13ac6f0..bb7084c 100644
--- a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K8x series configuration options
-#
+# Kinetis K8x series configuration options
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_KINETIS_K8X
 
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.series b/soc/arm/nxp_kinetis/k8x/Kconfig.series
index 789431c..dbf5408 100644
--- a/soc/arm/nxp_kinetis/k8x/Kconfig.series
+++ b/soc/arm/nxp_kinetis/k8x/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K8x series MCU
-#
+# Kinetis K8x series MCU
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_KINETIS_K8X
 	bool "Kinetis K8x Series MCU"
diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.soc b/soc/arm/nxp_kinetis/k8x/Kconfig.soc
index 71c88b0..c83ad2b 100644
--- a/soc/arm/nxp_kinetis/k8x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/k8x/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis K8x series MCU
-#
+# Kinetis K8x series MCU
+
 # Copyright (c) 2019 SEAL AG
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Kinetis K8x MCU Selection"
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke14f16 b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke14f16
index f90f7e9..7aea95f 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke14f16
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke14f16
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE14F16 configuration options
-#
+# Kinetis KE14F16 configuration options
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKE14F16
 
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke16f16 b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke16f16
index 9b24cef..0a6debb 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke16f16
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke16f16
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE16F16 configuration options
-#
+# Kinetis KE16F16 configuration options
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKE16F16
 
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke18f16 b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke18f16
index c989e53..03e3a09 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke18f16
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.mke18f16
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE18F16 configuration options
-#
+# Kinetis KE18F16 configuration options
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKE18F16
 
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
index b6d01ef..3a82eeb 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE1xF series configuration options
-#
+# Kinetis KE1xF series configuration options
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_KINETIS_KE1XF
 
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.series b/soc/arm/nxp_kinetis/ke1xf/Kconfig.series
index a74620a..e500e63 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.series
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE1xF series MCU
-#
+# Kinetis KE1xF series MCU
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_KINETIS_KE1XF
 	bool "Kinetis KE1xF Series MCU"
diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
index ba34dac..e365140 100644
--- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KE1xF MCU line
-#
+# Kinetis KE1xF MCU line
+
 # Copyright (c) 2019 Vestas Wind Systems A/S
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Kinetis KE1xF MCU Selection"
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 b/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
index 9ef0e50..409a055 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KL2x SoC configuration options
-#
+# Kinetis KL2x SoC configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKL25Z4
 
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.series
index 5e8b74d..d117f4b 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KL2x series configuration options
-#
+# Kinetis KL2x series configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_KINETIS_KL2X
 
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.series b/soc/arm/nxp_kinetis/kl2x/Kconfig.series
index 4c63d7f..c616ab6 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.series
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KL2x MCU series
-#
+# Kinetis KL2x MCU series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_KINETIS_KL2X
 	bool "Kinetis KL2x Series MCU"
diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
index 3460808..7da61c2 100644
--- a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KL2x MCU series
-#
+# Kinetis KL2x MCU series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Kinetis KL2x MCU Selection"
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
index 8f48b9f..e04c94c8 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KW2xD SoC configuration options
-#
+# Kinetis KW2xD SoC configuration options
+
 # Copyright (c) 2017, Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKW22D5 || SOC_MKW24D5
 
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
index 368c5f7..a907245 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw40z4
@@ -1,9 +1,6 @@
-# Kconfig - Kinetis KWx SoC configuration options
-#
-# Copyright (c) 2017, NXP
-#
+# Kinetis KWx SoC configuration options
+
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKW40Z4
 
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
index ba5ec0b..84582fe 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KWx SoC configuration options
-#
+# Kinetis KWx SoC configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_MKW41Z4
 
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.series
index f7f0f73..e653088 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.series
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KWx series configuration options
-#
+# Kinetis KWx series configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_KINETIS_KWX
 
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.series b/soc/arm/nxp_kinetis/kwx/Kconfig.series
index 783600c..b7b0682 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.series
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KWx MCU series
-#
+# Kinetis KWx MCU series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_KINETIS_KWX
 	bool "Kinetis KWx Series MCU"
diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.soc b/soc/arm/nxp_kinetis/kwx/Kconfig.soc
index 4059f97..3e3c9d4 100644
--- a/soc/arm/nxp_kinetis/kwx/Kconfig.soc
+++ b/soc/arm/nxp_kinetis/kwx/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - Kinetis KWx MCU series
-#
+# Kinetis KWx MCU series
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "Kinetis KWx MCU Selection"
diff --git a/soc/arm/nxp_lpc/Kconfig b/soc/arm/nxp_lpc/Kconfig
index 339f648..16671d4 100644
--- a/soc/arm/nxp_lpc/Kconfig
+++ b/soc/arm/nxp_lpc/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_LPC
 	bool
diff --git a/soc/arm/nxp_lpc/Kconfig.defconfig b/soc/arm/nxp_lpc/Kconfig.defconfig
index aaca7b0..d702a25 100644
--- a/soc/arm/nxp_lpc/Kconfig.defconfig
+++ b/soc/arm/nxp_lpc/Kconfig.defconfig
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nxp_lpc/*/Kconfig.defconfig.series"
diff --git a/soc/arm/nxp_lpc/Kconfig.soc b/soc/arm/nxp_lpc/Kconfig.soc
index dce9360..5538bbf 100644
--- a/soc/arm/nxp_lpc/Kconfig.soc
+++ b/soc/arm/nxp_lpc/Kconfig.soc
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/nxp_lpc/*/Kconfig.series"
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m0 b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m0
index a17db87..3889ef6 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m0
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m0
@@ -1,10 +1,7 @@
-# Kconfig - NXP LPC54114 M0 platform configuration options
+# NXP LPC54114 M0 platform configuration options
 
-#
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_LPC54114_M0
 
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m4 b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m4
index b82ae41..5b55ede 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m4
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.lpc54114_m4
@@ -1,9 +1,7 @@
-# Kconfig - NXP LPC54114 platform configuration options
-#
+# NXP LPC54114 platform configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_LPC54114_M4
 
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.series b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.series
index c5b6247..f719b18 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.series
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig -  LPC54XXX series configuration options
-#
+# LPC54XXX series configuration options
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_LPC54XXX
 
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series
index 2cc74eb..31c4c36 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - LPC LPC54XXX MCU line
-#
+# LPC LPC54XXX MCU line
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_LPC54XXX
 	bool "LPC LPC54xxx Series MCU"
diff --git a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
index cff645c..d5b2949 100644
--- a/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
+++ b/soc/arm/nxp_lpc/lpc54xxx/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - LPC LPC54XXX MCU line
-#
+# LPC LPC54XXX MCU line
+
 # Copyright (c) 2017, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "LPC LPC54XXX MCU Selection"
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0
index adb2e98..ecf23a1 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0
@@ -1,9 +1,7 @@
-# Kconfig - NXP LPC55XXX CPU0 platform configuration options
-#
+# NXP LPC55XXX CPU0 platform configuration options
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_LPC55S69_CPU0
 
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu1 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu1
index cc3ba20..75ba948 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu1
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu1
@@ -1,9 +1,7 @@
-# Kconfig - NXP LPC55S69 CPU1 platform configuration options
-#
+# NXP LPC55S69 CPU1 platform configuration options
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_LPC55S69_CPU1
 
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.series b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.series
index a2a6476..05a0f08 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.series
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig -  LPC55XXX series configuration options
-#
+# LPC55XXX series configuration options
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_LPC55XXX
 
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series
index 8865ca1..778679b 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - LPC LPC55XXX Series
-#
+# LPC LPC55XXX Series
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_LPC55XXX
 	bool "LPC5500 Series Family MCU"
diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
index 2e99900..bc78617 100644
--- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
+++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - LPC LPC55XXX Series
-#
+# LPC LPC55XXX Series
+
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "LPC5500 Series MCU Selection"
diff --git a/soc/arm/silabs_exx32/Kconfig b/soc/arm/silabs_exx32/Kconfig
index c52f76e..3fb5bf5 100644
--- a/soc/arm/silabs_exx32/Kconfig
+++ b/soc/arm/silabs_exx32/Kconfig
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2017 Christian Taedcke
 # Copyright (c) 2018 Gil Benkoe
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_EXX32
 	bool
diff --git a/soc/arm/silabs_exx32/Kconfig.soc b/soc/arm/silabs_exx32/Kconfig.soc
index f3f6edd..c5e43b6 100644
--- a/soc/arm/silabs_exx32/Kconfig.soc
+++ b/soc/arm/silabs_exx32/Kconfig.soc
@@ -1,7 +1,4 @@
-#
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/silabs_exx32/*/Kconfig.series"
diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.efm32hg b/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.efm32hg
index 7d65eb3..f547a0a 100644
--- a/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.efm32hg
+++ b/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.efm32hg
@@ -1,10 +1,7 @@
-# Kconfig - Silicon Labs EFM32HG-SLSTK3400A platform configuration options
+# Silicon Labs EFM32HG-SLSTK3400A platform configuration options
 
-#
 # Copyright (c) 2018 Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if GPIO
 
diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.series b/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.series
index f6217ae..3556920 100644
--- a/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.series
+++ b/soc/arm/silabs_exx32/efm32hg/Kconfig.defconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - EFM32HG series configuration options
-#
+# EFM32HG series configuration options
+
 # Copyright (c) 2018 Christian Taedcke
 # Copyright (c) 2018 Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32HG
 
diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.series b/soc/arm/silabs_exx32/efm32hg/Kconfig.series
index 66d8e92..7c0aa4f 100644
--- a/soc/arm/silabs_exx32/efm32hg/Kconfig.series
+++ b/soc/arm/silabs_exx32/efm32hg/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - EFM32HG MCU line
-#
+# EFM32HG MCU line
+
 # Copyright (c) 2018 Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_EFM32HG
 	bool "EFM32HG Series MCU"
diff --git a/soc/arm/silabs_exx32/efm32hg/Kconfig.soc b/soc/arm/silabs_exx32/efm32hg/Kconfig.soc
index fb3b7fd..274cc4d 100644
--- a/soc/arm/silabs_exx32/efm32hg/Kconfig.soc
+++ b/soc/arm/silabs_exx32/efm32hg/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - EFM32HG (Happy Gecko) MCU line
-#
+# EFM32HG (Happy Gecko) MCU line
+
 # Copyright (c) 2018 Marcio Montenegro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32HG
 
diff --git a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.efm32pg12b b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.efm32pg12b
index ef49787..03c7829 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.efm32pg12b
+++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.efm32pg12b
@@ -1,10 +1,7 @@
-# Kconfig - Silicon Labs EFM32PG-STK3402A platform configuration options
+# Silicon Labs EFM32PG-STK3402A platform configuration options
 
-#
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if GPIO || LOG_BACKEND_SWO
 
diff --git a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.series b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.series
index 5c2890f..cacd17b 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.series
+++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - EFM32PG12B series configuration options
+# EFM32PG12B series configuration options
 
-#
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32PG12B
 
diff --git a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series
index e193389..bea42e7 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series
+++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - EFM32PG12B MCU line
-#
+# EFM32PG12B MCU line
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_EFM32PG12B
 	bool "EFM32PG12B Series MCU"
diff --git a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.soc b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.soc
index a6401b2..4a9a58a 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/Kconfig.soc
+++ b/soc/arm/silabs_exx32/efm32pg12b/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - EFM32PG12B (Pearl Gecko) MCU line
-#
+# EFM32PG12B (Pearl Gecko) MCU line
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32PG12B
 
diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.efm32wg b/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.efm32wg
index 1e53423..1bc3f67 100644
--- a/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.efm32wg
+++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.efm32wg
@@ -1,10 +1,7 @@
-# Kconfig - Silicon Labs EFM32WG-STK3800 platform configuration options
+# Silicon Labs EFM32WG-STK3800 platform configuration options
 
-#
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if GPIO
 
diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.series b/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.series
index 7d505e5..d470e3b 100644
--- a/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.series
+++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - EFM32WG series configuration options
+# EFM32WG series configuration options
 
-#
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32WG
 
diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.series b/soc/arm/silabs_exx32/efm32wg/Kconfig.series
index 68afd4e..72ca103 100644
--- a/soc/arm/silabs_exx32/efm32wg/Kconfig.series
+++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - EFM32WG MCU line
-#
+# EFM32WG MCU line
+
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_EFM32WG
 	bool "EFM32WG Series MCU"
diff --git a/soc/arm/silabs_exx32/efm32wg/Kconfig.soc b/soc/arm/silabs_exx32/efm32wg/Kconfig.soc
index 863dd20..485cb70 100644
--- a/soc/arm/silabs_exx32/efm32wg/Kconfig.soc
+++ b/soc/arm/silabs_exx32/efm32wg/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - EFM32WG (Wonder Gecko) MCU line
-#
+# EFM32WG (Wonder Gecko) MCU line
+
 # Copyright (c) 2017 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFM32WG
 
diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.efr32fg1p b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.efr32fg1p
index 3799da7..7bedce3 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.efr32fg1p
+++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.efr32fg1p
@@ -1,10 +1,7 @@
-# Kconfig - Silicon Labs EFR32FG1P platform configuration options
+# Silicon Labs EFR32FG1P platform configuration options
 
-#
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if GPIO || LOG_BACKEND_SWO
 
diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.series b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.series
index e3ee8b0..601e5e4 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.series
+++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - EFR32FG1P series configuration options
+# EFR32FG1P series configuration options
 
-#
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFR32FG1P
 
diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series
index a8493ee..ba5e3dd 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series
+++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - EFR32FG1P MCU line
-#
+# EFR32FG1P MCU line
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_EFR32FG1P
 	bool "EFR32FG1P Series MCU"
diff --git a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.soc b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.soc
index 572573a..325e15d 100644
--- a/soc/arm/silabs_exx32/efr32fg1p/Kconfig.soc
+++ b/soc/arm/silabs_exx32/efr32fg1p/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - EFR32FG1P (Flex Gecko) MCU line
-#
+# EFR32FG1P (Flex Gecko) MCU line
+
 # Copyright (c) 2018 Christian Taedcke
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFR32FG1P
 
diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.efr32mg12p b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.efr32mg12p
index d457f59..4830507 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.efr32mg12p
+++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.efr32mg12p
@@ -1,10 +1,7 @@
-# Kconfig - Silicon Labs EFR32MG12P platform configuration options
+# Silicon Labs EFR32MG12P platform configuration options
 
-#
 # Copyright (c) 2018 Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if GPIO || LOG_BACKEND_SWO
 
diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.series b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.series
index 4007e31..ef7fa7b 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.series
+++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.defconfig.series
@@ -1,10 +1,7 @@
-# Kconfig - EFM32WG series configuration options
+# EFM32WG series configuration options
 
-#
 # Copyright (c) 2018 Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFR32MG12P
 
diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series
index 6ac4530..9cd8a68 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series
+++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - EFR32MG12P MCU line
-#
+# EFR32MG12P MCU line
+
 # Copyright (c) 2018 Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_EFR32MG12P
 	bool "EFR32MG12P Series MCU"
diff --git a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.soc b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.soc
index e0abbbf..bef46a6 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/Kconfig.soc
+++ b/soc/arm/silabs_exx32/efr32mg12p/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - EFR32MG12P (Mighty Gecko) MCU line
-#
+# EFR32MG12P (Mighty Gecko) MCU line
+
 # Copyright (c) 2018 Diego Sueiro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_EFR32MG12P
 
diff --git a/soc/arm/st_stm32/Kconfig b/soc/arm/st_stm32/Kconfig
index d135ca3..a9035ae 100644
--- a/soc/arm/st_stm32/Kconfig
+++ b/soc/arm/st_stm32/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32 MCU line
-#
+# ST Microelectronics STM32 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_STM32
 	bool
diff --git a/soc/arm/st_stm32/Kconfig.soc b/soc/arm/st_stm32/Kconfig.soc
index 687b030..b9ea04e 100644
--- a/soc/arm/st_stm32/Kconfig.soc
+++ b/soc/arm/st_stm32/Kconfig.soc
@@ -1,8 +1,6 @@
-# Kconfig - ST Microelectronics STM32 MCU line
-#
+# ST Microelectronics STM32 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/arm/st_stm32/*/Kconfig.series"
diff --git a/soc/arm/st_stm32/common/Kconfig.defconfig.series b/soc/arm/st_stm32/common/Kconfig.defconfig.series
index 0cc0866..f6fcff1 100644
--- a/soc/arm/st_stm32/common/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/common/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - ST Microelectronics STM32 all MCU lines
-#
+# ST Microelectronics STM32 all MCU lines
+
 # Copyright (c) 2017, I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Here are set all the Kconfig symbols common to the whole STM32 family
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.series
index c0f609a..54a6a69 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F0 MCU line
-#
+# ST Microelectronics STM32F0 MCU line
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F0 series
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x4 b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x4
index 7b91acb..527cd3c 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x4
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x4
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Antony Pavlov <antonynpavlov@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F030X4
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x8 b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x8
index 147af23..f7263ed 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x8
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f030x8
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F030X8 MCU
-#
+# ST Microelectronics STM32F030X8 MCU
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F030X8
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f051x8 b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f051x8
index 01504a3..66f76cc 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f051x8
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f051x8
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F051X8 MCU
-#
+# ST Microelectronics STM32F051X8 MCU
+
 # Copyright (c) 2018 Nathan Tsoi
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F051X8
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f070xb b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f070xb
index aa6333e..6c6a67a 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f070xb
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f070xb
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F070XB MCU
-#
+# ST Microelectronics STM32F070XB MCU
+
 # Copyright (c) 2018 qianfan Zhao
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F070XB
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f072xb b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f072xb
index 6c6e41b..dcb67a9 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f072xb
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f072xb
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F072XB MCU
-#
+# ST Microelectronics STM32F072XB MCU
+
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F072XB
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f091xc b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f091xc
index f9b64fa..9d17769 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f091xc
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.defconfig.stm32f091xc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F091XC MCU
-#
+# ST Microelectronics STM32F091XC MCU
+
 # Copyright (c) 2017 b0661n0e17e@gmail.com
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F091XC
 
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.series b/soc/arm/st_stm32/stm32f0/Kconfig.series
index 6054319..7e85dd2 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F0 MCU series
-#
+# ST Microelectronics STM32F0 MCU series
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F0X
 	bool "STM32F0x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f0/Kconfig.soc b/soc/arm/st_stm32/stm32f0/Kconfig.soc
index 4270cb2..98b3a5e 100644
--- a/soc/arm/st_stm32/stm32f0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f0/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F0 MCU line
-#
+# ST Microelectronics STM32F0 MCU line
+
 # Copyright (c) 2017 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F0x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.series
index 95cb43b..49e96e7 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F1 MCU line
-#
+# ST Microelectronics STM32F1 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F1 series
 
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
index 7344436..ea75491 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F103XX MCU
-#
+# ST Microelectronics STM32F103XX MCU
+
 # Copyright (c) 2017, embedjournal.com
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F103XB || SOC_STM32F103X8
 
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc
index ffe7815..04c2f71 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F107XC MCU
-#
+# ST Microelectronics STM32F107XC MCU
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F107XC
 
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.series b/soc/arm/st_stm32/stm32f1/Kconfig.series
index 07600d3..01ebf12 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F1 MCU series
-#
+# ST Microelectronics STM32F1 MCU series
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F1X
 	bool "STM32F1x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f1/Kconfig.soc b/soc/arm/st_stm32/stm32f1/Kconfig.soc
index 40b1ddb..00799a3 100644
--- a/soc/arm/st_stm32/stm32f1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f1/Kconfig.soc
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32F1 MCU line
-#
+# ST Microelectronics STM32F1 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F1x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.series
index 855ee1a..f460a62 100644
--- a/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F2 MCU line
-#
+# ST Microelectronics STM32F2 MCU line
+
 # Copyright (c) 2018 qianfan Zhao <qianfanguijin@163.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F2 series
 
diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.stm32f207xx b/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.stm32f207xx
index 641f4dc..3c4694f 100644
--- a/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.stm32f207xx
+++ b/soc/arm/st_stm32/stm32f2/Kconfig.defconfig.stm32f207xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics stm32f207 MCU
-#
+# ST Microelectronics stm32f207 MCU
+
 # Copyright (c) 2018 qianfan Zhao <qianfanguijin@163.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F207XX
 
diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.series b/soc/arm/st_stm32/stm32f2/Kconfig.series
index 1304e79..9b301a4 100644
--- a/soc/arm/st_stm32/stm32f2/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f2/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F2X MCU series
-#
+# ST Microelectronics STM32F2X MCU series
+
 # Copyright (c) 2018 qianfan Zhao <qianfanguijin@163.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F2X
 	bool "stm32f2x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f2/Kconfig.soc b/soc/arm/st_stm32/stm32f2/Kconfig.soc
index 2e7e7e7..ae40d9a 100644
--- a/soc/arm/st_stm32/stm32f2/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f2/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics stm32f2 MCU line
-#
+# ST Microelectronics stm32f2 MCU line
+
 # Copyright (c) 2018 qianfan Zhao <qianfanguijin@163.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F2X MCU Selection"
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.series
index b098ae9..d201971 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F3 MCU line
-#
+# ST Microelectronics STM32F3 MCU line
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F3 series
 
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f302x8 b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f302x8
index 9bf20a8..96cb104 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f302x8
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f302x8
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F302X8 MCU
-#
+# ST Microelectronics STM32F302X8 MCU
+
 # Copyright (c) 2018 Seitz & Associates
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F302X8
 
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc
index 85fd04a..f5d9c59 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F303XC MCU
-#
+# ST Microelectronics STM32F303XC MCU
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F303XC
 
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8 b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8
index 5272847..5c3039c 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F334X8 MCU
-#
+# ST Microelectronics STM32F334X8 MCU
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F334X8
 
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc
index 4c518a8..2fc12b8 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F373XC MCU
-#
+# ST Microelectronics STM32F373XC MCU
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F373XC
 
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.series b/soc/arm/st_stm32/stm32f3/Kconfig.series
index 4008805..c4b18b3 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F3 MCU series
-#
+# ST Microelectronics STM32F3 MCU series
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F3X
 	bool "STM32F3x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f3/Kconfig.soc b/soc/arm/st_stm32/stm32f3/Kconfig.soc
index 53aa7ad..2c7f17c 100644
--- a/soc/arm/st_stm32/stm32f3/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f3/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F3 MCU line
-#
+# ST Microelectronics STM32F3 MCU line
+
 # Copyright (c) 2016 RnDity Sp. z o.o.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F3x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.series
index 122926f..3853ed4 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - ST Microelectronics STM32F4 MCU line
-#
+# ST Microelectronics STM32F4 MCU line
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F4 series
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xc b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xc
index 1c67310..21549f8 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xc
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xc
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F401CC MCU configuration options
-#
+# ST STM32F401CC MCU configuration options
+
 # Copyright (c) 2019 Linumiz
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F401XC
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe
index 04040b1..643d071 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F401RE MCU configuration options
-#
+# ST STM32F401RE MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F401XE
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f405xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f405xx
index 3fdcc98..32ffc6e 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f405xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f405xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F405XX MCU configuration options
-#
+# ST STM32F405XX MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F405XG
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx
index 51657f1..b87fc53 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F407XX MCU configuration options
-#
+# ST STM32F407XX MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F407XG
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe
index 6f23d7b..e83c7bb 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F411CE MCU configuration options
-#
+# ST STM32F411CE MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F411XE
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
index 8ea0a72..19c6c7d 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F412CG MCU configuration options
-#
+# ST STM32F412CG MCU configuration options
+
 # Copyright (c) 2018, I-SENSE group of ICCS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F412CG
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
index 2be7b73..fcbf4d3 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F412ZG MCU configuration options
-#
+# ST STM32F412ZG MCU configuration options
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F412ZG
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f413xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f413xx
index e953147..bf16745 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f413xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f413xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F413XX MCU configuration options
-#
+# ST STM32F413XX MCU configuration options
+
 # Copyright (c) 2017 Florian Vaussard, HEIG-VD
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F413XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx
index 441fd91..8b9be0c 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F415RG MCU configuration options
-#
+# ST STM32F415RG MCU configuration options
+
 # Copyright (c) 2019, Kwon Tae-young <tykwon@m2i.co.kr>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F415XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx
index 676b4e4..de0a8ac 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F417XX MCU configuration options
-#
+# ST STM32F417XX MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F417XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx
index 5e3cb66..4d4374a 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F429XX MCU configuration options
-#
+# ST STM32F429XX MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F429XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f437xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f437xx
index b795da8..41ba9ea 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f437xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f437xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F437XX MCU configuration options
-#
+# ST STM32F437XX MCU configuration options
+
 # Copyright (c) 2019, Markus Fuchs <markus.fuchs@de.sauter-bc.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F437XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx
index a466162..2ed7bc4 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F446XE MCU configuration options
-#
+# ST STM32F446XE MCU configuration options
+
 # Copyright (c) 2018 Philemon Jaermann.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F446XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx
index 9b52405..24a9c93 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F469XI MCU configuration options
-#
+# ST STM32F469XI MCU configuration options
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F469XX
 
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.series b/soc/arm/st_stm32/stm32f4/Kconfig.series
index b88e12b..d713097 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F4 MCU series
-#
+# ST Microelectronics STM32F4 MCU series
+
 # Copyright (c) 2016 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F4X
 	bool "STM32F4x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.soc b/soc/arm/st_stm32/stm32f4/Kconfig.soc
index fc8aac3..19eec0e 100644
--- a/soc/arm/st_stm32/stm32f4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f4/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - ST Microelectronics STM32F4 MCU line
-#
+# ST Microelectronics STM32F4 MCU line
+
 # Copyright (c) 2016 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F4x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.series
index bc59d1a..4f85ab2 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - ST Microelectronics STM32F7 MCU line
-#
+# ST Microelectronics STM32F7 MCU line
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32F7 series
 
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f723xx b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f723xx
index c8e7725..ff7db64 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f723xx
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f723xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F723XE MCU configuration options
-#
+# ST STM32F723XE MCU configuration options
+
 # Copyright (c) 2018 Aurelien Jarno
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F723XX
 
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f746xx b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f746xx
index 1d12182..7553055 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f746xx
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f746xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F746XG MCU configuration options
-#
+# ST STM32F746XG MCU configuration options
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F746XX
 
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f756xx b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f756xx
index 6a68486..20c4cbf 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f756xx
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f756xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F756XX MCU configuration options
-#
+# ST STM32F756XX MCU configuration options
+
 # Copyright (c) 2018 AJ Palmer
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F756XX
 
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f769xx b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f769xx
index 704fd3d..a355e0f 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f769xx
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.defconfig.stm32f769xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32F769XI MCU configuration options
-#
+# ST STM32F769XI MCU configuration options
+
 # Copyright (c) 2018  Yong Jin
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32F769XX
 
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.series b/soc/arm/st_stm32/stm32f7/Kconfig.series
index a557dc9..7bb048e 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.series
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32F7 MCU series
-#
+# ST Microelectronics STM32F7 MCU series
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32F7X
 	bool "STM32F7x Series MCU"
diff --git a/soc/arm/st_stm32/stm32f7/Kconfig.soc b/soc/arm/st_stm32/stm32f7/Kconfig.soc
index fededec..889cb4c 100644
--- a/soc/arm/st_stm32/stm32f7/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32f7/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - ST Microelectronics STM32F7 MCU line
-#
+# ST Microelectronics STM32F7 MCU line
+
 # Copyright (c) 2018 Yurii Hamann
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32F7x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.series
index 9b86af6..14a4fd5 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - STMicroelectronics STM32G0 MCU line
-#
+# STMicroelectronics STM32G0 MCU line
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_STM32G0X
 
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071rb b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071rb
index f72d66f..52d0105 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071rb
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.defconfig.stm32g071rb
@@ -1,10 +1,8 @@
-# Kconfig - STMicroelectronics STM32G071RB MCU
-#
+# STMicroelectronics STM32G071RB MCU
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32G071XX
 
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.series b/soc/arm/st_stm32/stm32g0/Kconfig.series
index 5af41e3..6bf6342 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.series
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - STMicroelectronics STM32G0 MCU series
-#
+# STMicroelectronics STM32G0 MCU series
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32G0X
 	bool "STM32G0x Series MCU"
diff --git a/soc/arm/st_stm32/stm32g0/Kconfig.soc b/soc/arm/st_stm32/stm32g0/Kconfig.soc
index ea14cc0..f844288 100644
--- a/soc/arm/st_stm32/stm32g0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32g0/Kconfig.soc
@@ -1,10 +1,8 @@
-# Kconfig - STMicroelectronics STM32G0 MCU line
-#
+# STMicroelectronics STM32G0 MCU line
+
 # Copyright (c) 2019 Philippe Retornaz <philippe@shapescale.com>
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32G0x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.series
index 5fa1ea6..7de1f3d 100644
--- a/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics STM32G4 MCU line
-#
+# STMicroelectronics STM32G4 MCU line
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_STM32G4X
 
diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.stm32g431rb b/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.stm32g431rb
index 7249ce1..baeae0d 100644
--- a/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.stm32g431rb
+++ b/soc/arm/st_stm32/stm32g4/Kconfig.defconfig.stm32g431rb
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics STM32G431RB MCU
-#
+# STMicroelectronics STM32G431RB MCU
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32G431XX
 
diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.series b/soc/arm/st_stm32/stm32g4/Kconfig.series
index eba83d2..e666eed 100644
--- a/soc/arm/st_stm32/stm32g4/Kconfig.series
+++ b/soc/arm/st_stm32/stm32g4/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics STM32G4 MCU series
-#
+# STMicroelectronics STM32G4 MCU series
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32G4X
 	bool "STM32G4x Series MCU"
diff --git a/soc/arm/st_stm32/stm32g4/Kconfig.soc b/soc/arm/st_stm32/stm32g4/Kconfig.soc
index 897e1a7..bec1a90 100644
--- a/soc/arm/st_stm32/stm32g4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32g4/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - STMicroelectronics STM32G4 MCU line
-#
+# STMicroelectronics STM32G4 MCU line
+
 # Copyright (c) 2019 Richard Osterloh <richard.osterloh@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32G4x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.series
index 1115c21..2ad2e09 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - ST Microelectronics STM32H7 MCU line
-#
+# ST Microelectronics STM32H7 MCU line
+
 # Copyright (c) 2019 Linaro  Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32H7 series
 
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx b/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx
index 860e925..73b7c9e 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.defconfig.stm32h747xx
@@ -1,9 +1,7 @@
-# Kconfig - ST STM32H747X MCU configuration options
-#
+# ST STM32H747X MCU configuration options
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32H747XX
 
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.series b/soc/arm/st_stm32/stm32h7/Kconfig.series
index c1cbba2..09985e4 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.series
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32H7 MCU series
-#
+# ST Microelectronics STM32H7 MCU series
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32H7X
 	bool "STM32H7x Series MCU"
diff --git a/soc/arm/st_stm32/stm32h7/Kconfig.soc b/soc/arm/st_stm32/stm32h7/Kconfig.soc
index ee39af3..7c16606 100644
--- a/soc/arm/st_stm32/stm32h7/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32h7/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - ST Microelectronics STM32H7 MCU line
-#
+# ST Microelectronics STM32H7 MCU line
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32H7x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.series
index 3af243f..425ae01 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L0 MCU line
-#
+# ST Microelectronics STM32L0 MCU line
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32L0 series
 
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l053xx b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l053xx
index 48a3377..8e49a38 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l053xx
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l053xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L053X8 MCU
-#
+# ST Microelectronics STM32L053X8 MCU
+
 # Copyright (c) 2018 Anthony Kreft <anthony.kreft@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L053XX
 
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l072xx b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l072xx
index 75ec20f..ce8b71a 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l072xx
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l072xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L072XZ MCU
-#
+# ST Microelectronics STM32L072XZ MCU
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L072XX
 
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l073xx b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l073xx
index 1f31c93..6f140f4 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l073xx
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.defconfig.stm32l073xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L073XZ MCU
-#
+# ST Microelectronics STM32L073XZ MCU
+
 # Copyright (c) 2018 Ilya Tagunov <tagunil@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L073XX
 
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.series b/soc/arm/st_stm32/stm32l0/Kconfig.series
index 3d25586..17e3aea 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.series
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L0 MCU series
-#
+# ST Microelectronics STM32L0 MCU series
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32L0X
 	bool "STM32L0x Series MCU"
diff --git a/soc/arm/st_stm32/stm32l0/Kconfig.soc b/soc/arm/st_stm32/stm32l0/Kconfig.soc
index c6a57a3..c77550b 100644
--- a/soc/arm/st_stm32/stm32l0/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l0/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L0 MCU line
-#
+# ST Microelectronics STM32L0 MCU line
+
 # Copyright (c) 2018 Endre Karlson <endre.karlson@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32L0x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.series
index 90293e6..feea4bd 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L1 MCU line
-#
+# ST Microelectronics STM32L1 MCU line
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_STM32L1X
 
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a
index 5a5f7b3..7dd3311 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151x8a
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L151X8-A MCU
-#
+# ST Microelectronics STM32L151X8-A MCU
+
 # Copyright (c) 2019 eTactica ehf
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L151X8A
 
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb
index ee462f6..11c446b 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xb
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L151XB MCU
-#
+# ST Microelectronics STM32L151XB MCU
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L151XB
 
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba
index e73ebf3..dc02f1e 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l151xba
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L151XB-A MCU
-#
+# ST Microelectronics STM32L151XB-A MCU
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L151XBA
 
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.series b/soc/arm/st_stm32/stm32l1/Kconfig.series
index a57cb23..369e38c 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.series
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L1 MCU series
-#
+# ST Microelectronics STM32L1 MCU series
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32L1X
 	bool "STM32L1x Series MCU"
diff --git a/soc/arm/st_stm32/stm32l1/Kconfig.soc b/soc/arm/st_stm32/stm32l1/Kconfig.soc
index d238266..62d296e 100644
--- a/soc/arm/st_stm32/stm32l1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l1/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L1 MCU line
-#
+# ST Microelectronics STM32L1 MCU line
+
 # Copyright (c) 2019 Linaro Ltd.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32L1x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.series
index c895935..f08e2a2 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32L4 MCU line
-#
+# ST Microelectronics STM32L4 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 # Kconfig symbols common to STM32L4 series
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx
index 1b71854..384d2d1 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32L432XX MCU
-#
+# ST Microelectronics STM32L432XX MCU
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L432XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx
index 0c07cff..04d3449 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L433XX MCU
-#
+# ST Microelectronics STM32L433XX MCU
+
 # Copyright (c) 2018 David Lamparter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L433XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx
index 999169c..cc5398b 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L452XX MCU
-#
+# ST Microelectronics STM32L452XX MCU
+
 # Copyright (c) 2018 Georgij Cernysiov
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L452XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx
index c0470b7..12aab10 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l471xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L476RG MCU
-#
+# ST Microelectronics STM32L476RG MCU
+
 # Copyright (c) 2018 Allterco Robotics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L471XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx
index 8eb0461..13da8f6 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L475xG MCU
-#
+# ST Microelectronics STM32L475xG MCU
+
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L475XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx
index a10a89c..9ddbf73 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32L476RG MCU
-#
+# ST Microelectronics STM32L476RG MCU
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L476XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx
index b727bfd..ee5ec28 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx
@@ -1,11 +1,9 @@
-# Kconfig - ST Microelectronics STM32L496xx MCU
-#
+# ST Microelectronics STM32L496xx MCU
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
 # Copyright (c) 2019 Centaur Analytics, Inc
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L496XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx
index 8aeb9fd..6c7818e 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L4R5xx MCU
-#
+# ST Microelectronics STM32L4R5xx MCU
+
 # Copyright (c) 2018 Pushpal Sidhu
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L4R5XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx
index 72cbdba..ccdc1ca 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r9xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32L4R9xx MCU
-#
+# ST Microelectronics STM32L4R9xx MCU
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32L4R9XX
 
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.series b/soc/arm/st_stm32/stm32l4/Kconfig.series
index 723cd01..2e9f5e5 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.series
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.series
@@ -1,10 +1,8 @@
-# Kconfig - ST Microelectronics STM32L4 MCU series
-#
+# ST Microelectronics STM32L4 MCU series
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32L4X
 	bool "STM32L4x Series MCU"
diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.soc b/soc/arm/st_stm32/stm32l4/Kconfig.soc
index 032ea31..36fefa6 100644
--- a/soc/arm/st_stm32/stm32l4/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32l4/Kconfig.soc
@@ -1,12 +1,10 @@
-# Kconfig - ST Microelectronics STM32L4 MCU line
-#
+# ST Microelectronics STM32L4 MCU line
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 BayLibre, SAS
 # Copyright (c) 2019 Centaur Analytics, Inc
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32L4x MCU Selection"
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series
index de33fa9..0101943 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32MP1 MCU/MPU line
-#
+# ST Microelectronics STM32MP1 MCU/MPU line
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_STM32MP1X
 
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.stm32mp15_m4 b/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.stm32mp15_m4
index cc49cf7..20dd433 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.stm32mp15_m4
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.stm32mp15_m4
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32MP157C_M4 MCU
-#
+# ST Microelectronics STM32MP157C_M4 MCU
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32MP15_M4
 
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.series b/soc/arm/st_stm32/stm32mp1/Kconfig.series
index 59f4e9b..5443bec 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.series
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32MP1 MPU series
-#
+# ST Microelectronics STM32MP1 MPU series
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32MP1X
 	bool "STM32MP15 Series MPU"
diff --git a/soc/arm/st_stm32/stm32mp1/Kconfig.soc b/soc/arm/st_stm32/stm32mp1/Kconfig.soc
index d51284f..fe44c39 100644
--- a/soc/arm/st_stm32/stm32mp1/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32mp1/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32MP1 MPU line
-#
+# ST Microelectronics STM32MP1 MPU line
+
 # Copyright (c) 2019 STMicroelectronics
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32MP1 MPU Selection"
diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.series b/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.series
index 2ccafe8..226ed8e 100644
--- a/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.series
+++ b/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32WB MCU line
-#
+# ST Microelectronics STM32WB MCU line
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_STM32WBX
 
diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.stm32wb55xx b/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.stm32wb55xx
index c695806..175518e 100644
--- a/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.stm32wb55xx
+++ b/soc/arm/st_stm32/stm32wb/Kconfig.defconfig.stm32wb55xx
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32WB55XX MCU
-#
+# ST Microelectronics STM32WB55XX MCU
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_STM32WB55XX
 
diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.series b/soc/arm/st_stm32/stm32wb/Kconfig.series
index 06c453e..d0d2007 100644
--- a/soc/arm/st_stm32/stm32wb/Kconfig.series
+++ b/soc/arm/st_stm32/stm32wb/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32WB MCU series
-#
+# ST Microelectronics STM32WB MCU series
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_STM32WBX
 	bool "STM32WBx Series MCU"
diff --git a/soc/arm/st_stm32/stm32wb/Kconfig.soc b/soc/arm/st_stm32/stm32wb/Kconfig.soc
index 67fadab..df65225 100644
--- a/soc/arm/st_stm32/stm32wb/Kconfig.soc
+++ b/soc/arm/st_stm32/stm32wb/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - ST Microelectronics STM32WB MCU line
-#
+# ST Microelectronics STM32WB MCU line
+
 # Copyright (c) 2019 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "STM32WBx MCU Selection"
diff --git a/soc/arm/ti_lm3s6965/Kconfig b/soc/arm/ti_lm3s6965/Kconfig
index fc04b4e..f65a959 100644
--- a/soc/arm/ti_lm3s6965/Kconfig
+++ b/soc/arm/ti_lm3s6965/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - TI LM3S6965 platform configuration options
+# TI LM3S6965 platform configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_TI_LM3S6965
 
diff --git a/soc/arm/ti_lm3s6965/Kconfig.defconfig b/soc/arm/ti_lm3s6965/Kconfig.defconfig
index 1ea409e..6c8a17a 100644
--- a/soc/arm/ti_lm3s6965/Kconfig.defconfig
+++ b/soc/arm/ti_lm3s6965/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - TI LM3S6965 platform configuration options
+# TI LM3S6965 platform configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_TI_LM3S6965
 
diff --git a/soc/arm/ti_simplelink/Kconfig b/soc/arm/ti_simplelink/Kconfig
index 343e785..d260e66 100644
--- a/soc/arm/ti_simplelink/Kconfig
+++ b/soc/arm/ti_simplelink/Kconfig
@@ -1,6 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# Texas Instruments SimpleLink Family
 
-# Kconfig - Texas Instruments SimpleLink Family
+# SPDX-License-Identifier: Apache-2.0
 
 config SOC_FAMILY_TISIMPLELINK
 	bool
diff --git a/soc/arm/ti_simplelink/Kconfig.soc b/soc/arm/ti_simplelink/Kconfig.soc
index a5f9a60..780aad1 100644
--- a/soc/arm/ti_simplelink/Kconfig.soc
+++ b/soc/arm/ti_simplelink/Kconfig.soc
@@ -1,6 +1,5 @@
-# SPDX-License-Identifier: Apache-2.0
+# Texas Instruments SimpleLink Family
 
-# Kconfig - Texas Instruments SimpleLink Family
-#
+# SPDX-License-Identifier: Apache-2.0
 
 source "soc/arm/ti_simplelink/*/Kconfig.series"
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc1352r b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc1352r
index adbf192..bdec4be 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc1352r
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc1352r
@@ -1,4 +1,4 @@
-# Kconfig.defconfig.cc1352r - Texas Instruments SimpleLink CC1352R
+# Texas Instruments SimpleLink CC1352R
 #
 # Copyright (c) 2019 Brett Witherspoon
 #
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc2652r b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc2652r
index ca47263..38df3ed 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc2652r
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.cc2652r
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.cc2652r - Texas Instruments SimpleLink CC2652R
-#
+# Texas Instruments SimpleLink CC2652R
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_CC2652R
 
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series
index c943d74..705b305 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.defconfig.series - Texas Instruments SimpleLink CC13x2 / CC26x2
-#
+# Texas Instruments SimpleLink CC13x2 / CC26x2
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_SERIES_CC13X2_CC26X2
 
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series
index 3bfedc8..18ca9c0 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig.series - Texas Instruments SimpleLink CC13x2 / CC26x2
-#
+# Texas Instruments SimpleLink CC13x2 / CC26x2
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_CC13X2_CC26X2
 	bool "TI SimpleLink Family CC13x2 / CC26x2"
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
index fd3f3ca..e8152a3 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig.soc - Texas Instruments SimpleLink CC13x2 / CC26x2
-#
+# Texas Instruments SimpleLink CC13x2 / CC26x2
+
 # Copyright (c) 2019 Brett Witherspoon
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "TI SimpleLink MCU Selection"
diff --git a/soc/arm/ti_simplelink/cc2650/Kconfig.defconfig.series b/soc/arm/ti_simplelink/cc2650/Kconfig.defconfig.series
index fd45f00..0282baf 100644
--- a/soc/arm/ti_simplelink/cc2650/Kconfig.defconfig.series
+++ b/soc/arm/ti_simplelink/cc2650/Kconfig.defconfig.series
@@ -1,7 +1,6 @@
+# TI SimpleLink CC2650
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig.defconfig.series - TI SimpleLink CC2650
-#
 
 if SOC_SERIES_CC2650
 
diff --git a/soc/arm/ti_simplelink/cc2650/Kconfig.series b/soc/arm/ti_simplelink/cc2650/Kconfig.series
index 75c2340..f85c4a9 100644
--- a/soc/arm/ti_simplelink/cc2650/Kconfig.series
+++ b/soc/arm/ti_simplelink/cc2650/Kconfig.series
@@ -1,7 +1,6 @@
+# TI SimpleLink CC2650
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig.series - TI SimpleLink CC2650
-#
 
 config  SOC_SERIES_CC2650
 	bool "TI SimpleLink Family CC2650"
diff --git a/soc/arm/ti_simplelink/cc2650/Kconfig.soc b/soc/arm/ti_simplelink/cc2650/Kconfig.soc
index 9a2502c..bee0961 100644
--- a/soc/arm/ti_simplelink/cc2650/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc2650/Kconfig.soc
@@ -1,7 +1,6 @@
+# Texas Instruments CC2650
+
 # SPDX-License-Identifier: Apache-2.0
-#
-# Kconfig.soc - Texas Instruments CC2650
-#
 
 choice
 	prompt "TI SimpleLink MCU Selection"
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf
index 60234b2..2e88901 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink CC3220SF SoC
 
-# Kconfig.defconfig.cc3220sf - TI SimpleLink CC3220SF SoC
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_CC3220SF
 
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf
index ec8e39b..b36b439 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf
@@ -1,9 +1,7 @@
-# Copyright (c) 2019, Texas Instruments Incorporated
-#
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink CC3235SF SoC
 
-# Kconfig.defconfig.cc3235sf - TI SimpleLink CC3235SF SoC
-#
+# Copyright (c) 2019, Texas Instruments Incorporated
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_CC3235SF
 
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.series b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.series
index be23677..cd586e9 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.series
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.series
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink Family
 
-# Kconfig.defconfig.series - TI SimpleLink Family
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_CC32XX
 
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.series b/soc/arm/ti_simplelink/cc32xx/Kconfig.series
index aa7ec33..3567274 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.series
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.series
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# TI SimpleLink CC32xx
 
-# Kconfig.series - TI SimpleLink CC32xx
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config  SOC_SERIES_CC32XX
 	bool "TI SimpleLink Family"
diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
index 8187328..142dade 100644
--- a/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
+++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.soc
@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
+# Texas Instruments CC32XX
 
-# Kconfig.soc - Texas Instruments CC32XX
-#
+# SPDX-License-Identifier: Apache-2.0
 
 choice
 	prompt "TI SimpleLink MCU Selection"
diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p401r b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p401r
index a8ed14b..af491c6 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p401r
+++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p401r
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
-#
+# TI SimpleLink MSP432P401R SoC
+
 # Copyright (c) 2017, Linaro Ltd
-#
-# Kconfig.defconfig.msp432p401r- TI SimpleLink MSP432P401R SoC
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_MSP432P401R
 
diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.series b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.series
index 0b95927..55bf282 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.series
+++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.defconfig.series
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
-#
+# TI SimpleLink MSP432P4XX
+
 # Copyright (c) 2017, Linaro Ltd
-#
-# Kconfig.defconfig.series - TI SimpleLink MSP432P4XX
-#
+# SPDX-License-Identifier: Apache-2.0
 
 if SOC_SERIES_MSP432P4XX
 
diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series
index 773c6f3..17b97f7 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series
+++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.series
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
-#
+# TI SimpleLink MSP432P4XX
+
 # Copyright (c) 2017, Linaro Ltd
-#
-# Kconfig.series - TI SimpleLink MSP432P4XX
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_MSP432P4XX
 	bool "TI SimpleLink Family MSP432P4XX"
diff --git a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
index fb47024..4b3aa5c 100644
--- a/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
+++ b/soc/arm/ti_simplelink/msp432p4xx/Kconfig.soc
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
-#
+# Texas Instruments MSP432P401R
+
 # Copyright (c) 2017, Linaro Ltd
-#
-# Kconfig.soc - Texas Instruments MSP432P401R
-#
+# SPDX-License-Identifier: Apache-2.0
 
 choice
 	prompt "TI SimpleLink MCU Selection"
diff --git a/soc/arm/xilinx_zynqmp/Kconfig.defconfig b/soc/arm/xilinx_zynqmp/Kconfig.defconfig
index ba74d0a..5bdb7e0 100644
--- a/soc/arm/xilinx_zynqmp/Kconfig.defconfig
+++ b/soc/arm/xilinx_zynqmp/Kconfig.defconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2019 Lexmark International, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_XILINX_ZYNQMP
diff --git a/soc/arm/xilinx_zynqmp/Kconfig.soc b/soc/arm/xilinx_zynqmp/Kconfig.soc
index 4ad0bc7..cb0a41a 100644
--- a/soc/arm/xilinx_zynqmp/Kconfig.soc
+++ b/soc/arm/xilinx_zynqmp/Kconfig.soc
@@ -1,7 +1,6 @@
 # Copyright (c) 2019 Lexmark International, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config SOC_XILINX_ZYNQMP
 	bool "Xilinx ZynqMP"
 	select CPU_CORTEX_R5
diff --git a/soc/posix/inf_clock/Kconfig.defconfig b/soc/posix/inf_clock/Kconfig.defconfig
index 1f83838..0360131 100644
--- a/soc/posix/inf_clock/Kconfig.defconfig
+++ b/soc/posix/inf_clock/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_POSIX
 
diff --git a/soc/riscv/litex-vexriscv/Kconfig.defconfig b/soc/riscv/litex-vexriscv/Kconfig.defconfig
index d42ca4c..9447948 100644
--- a/soc/riscv/litex-vexriscv/Kconfig.defconfig
+++ b/soc/riscv/litex-vexriscv/Kconfig.defconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_RISCV32_LITEX_VEXRISCV
 
diff --git a/soc/riscv/litex-vexriscv/Kconfig.soc b/soc/riscv/litex-vexriscv/Kconfig.soc
index e977225..d912e98 100644
--- a/soc/riscv/litex-vexriscv/Kconfig.soc
+++ b/soc/riscv/litex-vexriscv/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_RISCV32_LITEX_VEXRISCV
 	bool "LiteX VexRiscv system implementation"
diff --git a/soc/riscv/openisa_rv32m1/Kconfig b/soc/riscv/openisa_rv32m1/Kconfig
index 6f5a2e5..ecd2985 100644
--- a/soc/riscv/openisa_rv32m1/Kconfig
+++ b/soc/riscv/openisa_rv32m1/Kconfig
@@ -1,5 +1,4 @@
 # Copyright (c) 2018 Foundries.io Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
 
 # The OpenISA RV32M1 SoC directory in riscv supports the RISC-V
diff --git a/soc/riscv/openisa_rv32m1/Kconfig.defconfig b/soc/riscv/openisa_rv32m1/Kconfig.defconfig
index bcd6e30..07e94d3 100644
--- a/soc/riscv/openisa_rv32m1/Kconfig.defconfig
+++ b/soc/riscv/openisa_rv32m1/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig.defconfig: RV32M1 SoC RISC-V core default configuration values
-#
+# RV32M1 SoC RISC-V core default configuration values
+
 # Copyright (c) 2018 Foundries.io Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
 
 if SOC_OPENISA_RV32M1_RISCV32
diff --git a/soc/riscv/openisa_rv32m1/Kconfig.soc b/soc/riscv/openisa_rv32m1/Kconfig.soc
index 3141eb4..bf02cd9 100644
--- a/soc/riscv/openisa_rv32m1/Kconfig.soc
+++ b/soc/riscv/openisa_rv32m1/Kconfig.soc
@@ -1,5 +1,4 @@
 # Copyright (c) 2018 Foundries.io Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
 
 config SOC_OPENISA_RV32M1_RISCV32
diff --git a/soc/riscv/riscv-privilege/Kconfig b/soc/riscv/riscv-privilege/Kconfig
index 7dee948..88128d0 100644
--- a/soc/riscv/riscv-privilege/Kconfig
+++ b/soc/riscv/riscv-privilege/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig - configuration options for riscv SOCs supporting
-#           the riscv privileged architecture specification
-#
+# Configuration options for riscv SOCs supporting the riscv privileged
+# architecture specification
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_FAMILY_RISCV_PRIVILEGE
 	bool
diff --git a/soc/riscv/riscv-privilege/Kconfig.defconfig b/soc/riscv/riscv-privilege/Kconfig.defconfig
index e4f9de0..d881530 100644
--- a/soc/riscv/riscv-privilege/Kconfig.defconfig
+++ b/soc/riscv/riscv-privilege/Kconfig.defconfig
@@ -1,7 +1,6 @@
-# Kconfig - riscv SOC family supporting the riscv privileged architecture spec
-#
+# riscv SOC family supporting the riscv privileged architecture spec
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 source "soc/riscv/riscv-privilege/*/Kconfig.defconfig.series"
diff --git a/soc/riscv/riscv-privilege/Kconfig.soc b/soc/riscv/riscv-privilege/Kconfig.soc
index 72625e8..5d0bad9 100644
--- a/soc/riscv/riscv-privilege/Kconfig.soc
+++ b/soc/riscv/riscv-privilege/Kconfig.soc
@@ -1,8 +1,6 @@
-# Kconfig - riscv SOC series supporting the riscv privileged architecture spec
-#
+# riscv SOC series supporting the riscv privileged architecture spec
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "soc/riscv/riscv-privilege/*/Kconfig.series"
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.series b/soc/riscv/riscv-privilege/miv/Kconfig.series
index eae3938..2940112 100644
--- a/soc/riscv/riscv-privilege/miv/Kconfig.series
+++ b/soc/riscv/riscv-privilege/miv/Kconfig.series
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
+# RISCV32_MIV implementation
 
-# Kconfig - RISCV32_MIV implementation
-#
 # Copyright (c) 2018 Antmicro <www.antmicro.com>
-#
+# SPDX-License-Identifier: Apache-2.0
 
 config SOC_SERIES_RISCV32_MIV
 	bool "Microsemi Mi-V implementation"
diff --git a/soc/riscv/riscv-privilege/miv/Kconfig.soc b/soc/riscv/riscv-privilege/miv/Kconfig.soc
index b10990c..a2028d4 100644
--- a/soc/riscv/riscv-privilege/miv/Kconfig.soc
+++ b/soc/riscv/riscv-privilege/miv/Kconfig.soc
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
+# RISCV32_MIV configuration options
 
-# Kconfig - RISCV32_MIV configuration options
-#
 # Copyright (c) 2018 Antmicro <www.antmicro.com>
-#
+# SPDX-License-Identifier: Apache-2.0
 
 choice
 	prompt "Microsemi Mi-V system implementation"
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series
index 073acc6..5ba73b5 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series
+++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series
@@ -1,9 +1,7 @@
-# Kconfig - RISCV_SIFIVE_FREEDOM SOC implementation
-#
+# RISCV_SIFIVE_FREEDOM SOC implementation
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_SERIES_RISCV_SIFIVE_FREEDOM
 	bool "SiFive Freedom SOC implementation"
diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
index df48252..0777670 100644
--- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
+++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc
@@ -1,9 +1,7 @@
-# Kconfig - RISCV_SIFIVE_FREEDOM SOC configuration options
-#
+# RISCV_SIFIVE_FREEDOM SOC configuration options
+
 # Copyright (c) 2017 Jean-Paul Etienne <fractalclone@gmail.com>
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "SiFive Freedom SOC implementation"
diff --git a/soc/x86/apollo_lake/Kconfig.defconfig b/soc/x86/apollo_lake/Kconfig.defconfig
index 97d8be3..f03381c 100644
--- a/soc/x86/apollo_lake/Kconfig.defconfig
+++ b/soc/x86/apollo_lake/Kconfig.defconfig
@@ -1,11 +1,8 @@
-#
-# Kconfig - Apollo Lake SoC configuration options
-#
+# Apollo Lake SoC configuration options
+
 # Copyright (c) 2018-2019 Intel Corporation
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_APOLLO_LAKE
 
diff --git a/soc/x86/apollo_lake/Kconfig.soc b/soc/x86/apollo_lake/Kconfig.soc
index 4e2a17c..3263d2a 100644
--- a/soc/x86/apollo_lake/Kconfig.soc
+++ b/soc/x86/apollo_lake/Kconfig.soc
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config SOC_APOLLO_LAKE
 	bool "Intel Apollo Lake Soc"
diff --git a/soc/x86/atom/Kconfig.defconfig b/soc/x86/atom/Kconfig.defconfig
index 0c3ab15..ae7fa20 100644
--- a/soc/x86/atom/Kconfig.defconfig
+++ b/soc/x86/atom/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - ATOM SoC configuration options
+# ATOM SoC configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_ATOM
 
diff --git a/soc/x86/ia32/Kconfig.defconfig b/soc/x86/ia32/Kconfig.defconfig
index b97608e..203021d 100644
--- a/soc/x86/ia32/Kconfig.defconfig
+++ b/soc/x86/ia32/Kconfig.defconfig
@@ -1,10 +1,7 @@
-# Kconfig - generic PC platform configuration options
+# Generic PC platform configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if SOC_IA32
 
diff --git a/soc/xtensa/esp32/Kconfig.defconfig b/soc/xtensa/esp32/Kconfig.defconfig
index 0fafd45..1a1967c 100644
--- a/soc/xtensa/esp32/Kconfig.defconfig
+++ b/soc/xtensa/esp32/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - ESP32 board configuration
-#
+# ESP32 board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/xtensa/intel_s1000/Kconfig.defconfig b/soc/xtensa/intel_s1000/Kconfig.defconfig
index a629aef..1003b68 100644
--- a/soc/xtensa/intel_s1000/Kconfig.defconfig
+++ b/soc/xtensa/intel_s1000/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - XTENSA board configuration
-#
+# XTENSA board configuration
+
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
diff --git a/soc/xtensa/sample_controller/Kconfig.defconfig b/soc/xtensa/sample_controller/Kconfig.defconfig
index 0e71915..c0ed4c9 100644
--- a/soc/xtensa/sample_controller/Kconfig.defconfig
+++ b/soc/xtensa/sample_controller/Kconfig.defconfig
@@ -1,5 +1,5 @@
-# Kconfig - XTENSA board configuration
-#
+# XTENSA board configuration
+
 # Copyright (c) 2016 Open-RnD Sp. z o.o.
 # Copyright (c) 2016 Cadence Design Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
diff --git a/subsys/Kconfig b/subsys/Kconfig
index f0338d9..4126697 100644
--- a/subsys/Kconfig
+++ b/subsys/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Subsystem configuration options
-#
+# Subsystem configuration options
+
 # Copyright (c) 2016-2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 source "subsys/bluetooth/Kconfig"
 
diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig
index b9b5c41..04709ee 100644
--- a/subsys/bluetooth/Kconfig
+++ b/subsys/bluetooth/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - Bluetooth configuration options
-#
+# Bluetooth configuration options
+
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig BT
diff --git a/subsys/bluetooth/common/Kconfig b/subsys/bluetooth/common/Kconfig
index db43142..2c9b97a 100644
--- a/subsys/bluetooth/common/Kconfig
+++ b/subsys/bluetooth/common/Kconfig
@@ -1,10 +1,8 @@
-# Kconfig - Bluetooth common configuration options
-#
+# Bluetooth common configuration options
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BT_HAS_HCI_VS
 	bool
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
index 909b33b..5646bf6 100644
--- a/subsys/bluetooth/controller/Kconfig
+++ b/subsys/bluetooth/controller/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Bluetooth Controller configuration options
-#
+# Bluetooth Controller configuration options
+
 # Copyright (c) 2016-2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 comment "BLE Controller support"
 
diff --git a/subsys/bluetooth/host/Kconfig b/subsys/bluetooth/host/Kconfig
index f9c1bb1..f67d277 100644
--- a/subsys/bluetooth/host/Kconfig
+++ b/subsys/bluetooth/host/Kconfig
@@ -1,11 +1,8 @@
-# Kconfig - Bluetooth LE stack configuration options
+# Bluetooth LE stack configuration options
 
-#
 # Copyright (c) 2016-2017 Nordic Semiconductor ASA
 # Copyright (c) 2015-2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 comment "Host Stack Configuration"
 
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index 4055baa..7f199e2 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -1,10 +1,7 @@
-# Kconfig - Bluetooth ATT/GATT configuration options
+# Bluetooth ATT/GATT configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "ATT and GATT Options"
 
diff --git a/subsys/bluetooth/host/Kconfig.l2cap b/subsys/bluetooth/host/Kconfig.l2cap
index 5241f86..e8be186 100644
--- a/subsys/bluetooth/host/Kconfig.l2cap
+++ b/subsys/bluetooth/host/Kconfig.l2cap
@@ -1,10 +1,7 @@
-# Kconfig - Bluetooth ATT/GATT configuration options
+# Bluetooth ATT/GATT configuration options
 
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "L2CAP Options"
 
diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 59d59c4..144ce62 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Bluetooth Mesh configuration options
+# Bluetooth Mesh configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BT_MESH
 	bool "Bluetooth Mesh support"
diff --git a/subsys/bluetooth/services/Kconfig b/subsys/bluetooth/services/Kconfig
index 9593f38..8e0202c 100644
--- a/subsys/bluetooth/services/Kconfig
+++ b/subsys/bluetooth/services/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - GATT Services
-#
+# GATT Services
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 if BT_CONN
 
diff --git a/subsys/bluetooth/services/Kconfig.bas b/subsys/bluetooth/services/Kconfig.bas
index 189c786..29f532f 100644
--- a/subsys/bluetooth/services/Kconfig.bas
+++ b/subsys/bluetooth/services/Kconfig.bas
@@ -1,9 +1,7 @@
-# Kconfig - Bluetooth GATT Battery service
-#
+# Bluetooth GATT Battery service
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BT_GATT_BAS
 	bool "Enable GATT Battery service"
diff --git a/subsys/bluetooth/services/Kconfig.dis b/subsys/bluetooth/services/Kconfig.dis
index 663fb07..2759f79 100644
--- a/subsys/bluetooth/services/Kconfig.dis
+++ b/subsys/bluetooth/services/Kconfig.dis
@@ -1,9 +1,7 @@
-# Kconfig - GATT Device Information service
-#
+# GATT Device Information service
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BT_GATT_DIS
 	bool "Enable GATT Device Information service"
diff --git a/subsys/bluetooth/services/Kconfig.hrs b/subsys/bluetooth/services/Kconfig.hrs
index 7b49919..f7430fe 100644
--- a/subsys/bluetooth/services/Kconfig.hrs
+++ b/subsys/bluetooth/services/Kconfig.hrs
@@ -1,9 +1,7 @@
-# Kconfig - Bluetooth GATT Heart Rate service
-#
+# Bluetooth GATT Heart Rate service
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig BT_GATT_HRS
 	bool "Enable GATT Heart Rate service"
diff --git a/subsys/bluetooth/shell/Kconfig b/subsys/bluetooth/shell/Kconfig
index 2378bc7..0788e14 100644
--- a/subsys/bluetooth/shell/Kconfig
+++ b/subsys/bluetooth/shell/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Shell configuration options
+# Shell configuration options
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BT_SHELL
 	bool "Enable Bluetooth shell"
diff --git a/subsys/console/Kconfig b/subsys/console/Kconfig
index 847ffe7..2a4399d 100644
--- a/subsys/console/Kconfig
+++ b/subsys/console/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig CONSOLE_SUBSYS
 	bool "Console subsystem/support routines [EXPERIMENTAL]"
diff --git a/subsys/cpp/Kconfig b/subsys/cpp/Kconfig
index c0ead3d..369e97a 100644
--- a/subsys/cpp/Kconfig
+++ b/subsys/cpp/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - C++ configuration options
+# C++ configuration options
 
-#
 # Copyright (c) 2018 B. Leforestier
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig CPLUSPLUS
 	bool "C++ support for the application"
diff --git a/subsys/debug/Kconfig b/subsys/debug/Kconfig
index 201b43a..52c1296 100644
--- a/subsys/debug/Kconfig
+++ b/subsys/debug/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - debug configuration options
+# Debug configuration options
 
-#
 # Copyright (c) 2015 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "System Monitoring Options"
 
diff --git a/subsys/debug/Kconfig.segger b/subsys/debug/Kconfig.segger
index e74a90c..b0a9fdb 100644
--- a/subsys/debug/Kconfig.segger
+++ b/subsys/debug/Kconfig.segger
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HAS_SEGGER_RTT
 	bool
diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index ce1b158..439efef 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -1,7 +1,6 @@
-# Kconfig - DFU support configuration options
-#
+# DFU support configuration options
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
 
 #
diff --git a/subsys/disk/Kconfig b/subsys/disk/Kconfig
index 6fc02c7..402d607 100644
--- a/subsys/disk/Kconfig
+++ b/subsys/disk/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig DISK_ACCESS
 	bool "Disk Interface"
diff --git a/subsys/fb/Kconfig b/subsys/fb/Kconfig
index f8c2895..7fb82ee 100644
--- a/subsys/fb/Kconfig
+++ b/subsys/fb/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - frame buffer configuration options
+# Frame buffer configuration options
 
-#
 # Copyright (c) 2018 Phytec Messtechnik GmbH
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig CHARACTER_FRAMEBUFFER
 	bool "Character framebuffer for dot matrix displays"
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
index 1c7dc71..a299af3 100644
--- a/subsys/fs/Kconfig
+++ b/subsys/fs/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "File Systems"
 
diff --git a/subsys/fs/Kconfig.littlefs b/subsys/fs/Kconfig.littlefs
index 4935ad2..a5373dc 100644
--- a/subsys/fs/Kconfig.littlefs
+++ b/subsys/fs/Kconfig.littlefs
@@ -1,9 +1,6 @@
-#
 # Copyright (c) 2019 Bolt Innovation Management, LLC
 # Copyright (c) 2019 Peter Bigot Consulting, LLC
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "LittleFS Settings"
 	visible if FILE_SYSTEM_LITTLEFS
diff --git a/subsys/fs/fcb/Kconfig b/subsys/fs/fcb/Kconfig
index a36c3fd..b50fd7c 100644
--- a/subsys/fs/fcb/Kconfig
+++ b/subsys/fs/fcb/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Flash Circular Buffer module
-#
+# Flash Circular Buffer module
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # Flash Circular Buffer
diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index 097dbb6..5fe8a2b 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -1,4 +1,4 @@
-# Kconfig - Non-volatile Storage NVS
+# Non-volatile Storage NVS
 
 # Copyright (c) 2018 Laczen
 # SPDX-License-Identifier: Apache-2.0
diff --git a/subsys/jwt/Kconfig b/subsys/jwt/Kconfig
index a71e643..f61a0a7 100644
--- a/subsys/jwt/Kconfig
+++ b/subsys/jwt/Kconfig
@@ -1,8 +1,6 @@
-#
 # Copyright (c) 2018 Linaro
-#
 # SPDX-License-Identifier: Apache-2.0
-#
+
 menuconfig JWT
 	bool "Enable JSON Web Token generation"
 	select JSON_LIBRARY
diff --git a/subsys/logging/Kconfig b/subsys/logging/Kconfig
index d503d56..b47b8c1 100644
--- a/subsys/logging/Kconfig
+++ b/subsys/logging/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LOG
 	bool "Logging"
diff --git a/subsys/mgmt/Kconfig b/subsys/mgmt/Kconfig
index 3a30b90..db79f2e 100644
--- a/subsys/mgmt/Kconfig
+++ b/subsys/mgmt/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - mcumgr configuration options
+# mcumgr configuration options
 
-#
 # Copyright Runtime.io 2018. All rights reserved.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Management"
 
diff --git a/subsys/mgmt/Kconfig.mcumgr b/subsys/mgmt/Kconfig.mcumgr
index a60d4d8..c11d723 100644
--- a/subsys/mgmt/Kconfig.mcumgr
+++ b/subsys/mgmt/Kconfig.mcumgr
@@ -1,7 +1,6 @@
-#
 # Copyright Runtime.io 2018. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
-#
+
 config MCUMGR
 	bool "mcumgr Support"
 	select NET_BUF
diff --git a/subsys/net/Kconfig b/subsys/net/Kconfig
index f8fe46b..7e7c9d3 100644
--- a/subsys/net/Kconfig
+++ b/subsys/net/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - net stack configuration options
+# Net stack configuration options
 
-#
 # Copyright (c) 2015 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Networking"
 
diff --git a/subsys/net/Kconfig.hostname b/subsys/net/Kconfig.hostname
index 618a6af..51c747b 100644
--- a/subsys/net/Kconfig.hostname
+++ b/subsys/net/Kconfig.hostname
@@ -1,10 +1,7 @@
-# Kconfig - Hostname config
+# Hostname config
 
-#
 # Copyright (c) 2017 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config NET_HOSTNAME_ENABLE
 	bool "Add hostname to the device"
diff --git a/subsys/net/Kconfig.template.log_config.default.net b/subsys/net/Kconfig.template.log_config.default.net
index f09d51a..5bdace0 100644
--- a/subsys/net/Kconfig.template.log_config.default.net
+++ b/subsys/net/Kconfig.template.log_config.default.net
@@ -1,11 +1,9 @@
 # Kconfig template file for setting networking log level for
 # various network related components. This template variant
 # allows user to specify the default log level.
-#
+
 # Copyright (c) 2018 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "$(module-str)"
diff --git a/subsys/net/Kconfig.template.log_config.net b/subsys/net/Kconfig.template.log_config.net
index d9a07e9..49596a2 100644
--- a/subsys/net/Kconfig.template.log_config.net
+++ b/subsys/net/Kconfig.template.log_config.net
@@ -1,10 +1,8 @@
 # Kconfig template file for setting networking log level for
 # various network related components.
-#
+
 # Copyright (c) 2018 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 choice
 	prompt "$(module-str)"
diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index 5a0875f..df430d0 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - IP stack config
+# IP stack config
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "IP stack"
 
diff --git a/subsys/net/ip/Kconfig.debug b/subsys/net/ip/Kconfig.debug
index b1b16a0..58896bc 100644
--- a/subsys/net/ip/Kconfig.debug
+++ b/subsys/net/ip/Kconfig.debug
@@ -1,10 +1,7 @@
-# Kconfig.debug - Debug Options
+# Debug Options
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_LOG
 	bool "Enable network stack logging and debugging"
diff --git a/subsys/net/ip/Kconfig.ipv4 b/subsys/net/ip/Kconfig.ipv4
index e23b3d9..71f403c 100644
--- a/subsys/net/ip/Kconfig.ipv4
+++ b/subsys/net/ip/Kconfig.ipv4
@@ -1,10 +1,7 @@
-# Kconfig.ipv4 - IPv4 Options
+# IPv4 Options
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_IPV4
 	bool "IPv4"
diff --git a/subsys/net/ip/Kconfig.ipv6 b/subsys/net/ip/Kconfig.ipv6
index 7730911..b4ebe14 100644
--- a/subsys/net/ip/Kconfig.ipv6
+++ b/subsys/net/ip/Kconfig.ipv6
@@ -1,10 +1,7 @@
-# Kconfig.ipv6 - IPv6 Options
+# IPv6 Options
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_IPV6
 	bool "IPv6"
diff --git a/subsys/net/ip/Kconfig.mgmt b/subsys/net/ip/Kconfig.mgmt
index fd967cc..682380e 100644
--- a/subsys/net/ip/Kconfig.mgmt
+++ b/subsys/net/ip/Kconfig.mgmt
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_MGMT
 	bool "Network Management API"
diff --git a/subsys/net/ip/Kconfig.stack b/subsys/net/ip/Kconfig.stack
index b5fa63e..c02fe47 100644
--- a/subsys/net/ip/Kconfig.stack
+++ b/subsys/net/ip/Kconfig.stack
@@ -1,10 +1,7 @@
-# Kconfig.stack - Stack usage related options
+# Stack usage related options
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Stack usage"
 
diff --git a/subsys/net/ip/Kconfig.stats b/subsys/net/ip/Kconfig.stats
index f402bd5..1764d9a 100644
--- a/subsys/net/ip/Kconfig.stats
+++ b/subsys/net/ip/Kconfig.stats
@@ -1,10 +1,7 @@
-# Kconfig.stats - Statistics Options
+# Statistics Options
 
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_STATISTICS
 	bool "Network statistics"
diff --git a/subsys/net/l2/Kconfig b/subsys/net/l2/Kconfig
index fa34047..d8108d4 100644
--- a/subsys/net/l2/Kconfig
+++ b/subsys/net/l2/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Link layer options"
 
diff --git a/subsys/net/l2/canbus/Kconfig b/subsys/net/l2/canbus/Kconfig
index 0f999cf..89e67bf 100644
--- a/subsys/net/l2/canbus/Kconfig
+++ b/subsys/net/l2/canbus/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Alexander Wachter
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config NET_L2_CANBUS
 	bool "Enable CANBUS L2 layer [EXPERIMENTAL]"
diff --git a/subsys/net/l2/ethernet/Kconfig b/subsys/net/l2/ethernet/Kconfig
index 7777a4a..9fd0049 100644
--- a/subsys/net/l2/ethernet/Kconfig
+++ b/subsys/net/l2/ethernet/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_L2_ETHERNET
 	bool "Enable Ethernet support"
diff --git a/subsys/net/l2/ethernet/gptp/Kconfig b/subsys/net/l2/ethernet/gptp/Kconfig
index e756bae..a153db8 100644
--- a/subsys/net/l2/ethernet/gptp/Kconfig
+++ b/subsys/net/l2/ethernet/gptp/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_GPTP
 	bool "Enable IEEE 802.1AS (gPTP) support [EXPERIMENTAL]"
diff --git a/subsys/net/l2/ethernet/lldp/Kconfig b/subsys/net/l2/ethernet/lldp/Kconfig
index 52d2499..7556fcd 100644
--- a/subsys/net/l2/ethernet/lldp/Kconfig
+++ b/subsys/net/l2/ethernet/lldp/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_LLDP
 	bool "Enable Link Layer Discovery Protocol (LLDP)"
diff --git a/subsys/net/l2/ieee802154/Kconfig b/subsys/net/l2/ieee802154/Kconfig
index 8f9078f..ba58c04 100644
--- a/subsys/net/l2/ieee802154/Kconfig
+++ b/subsys/net/l2/ieee802154/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_L2_IEEE802154
 	bool "Enable IEEE 802.15.4 Radio"
diff --git a/subsys/net/l2/ieee802154/Kconfig.radio b/subsys/net/l2/ieee802154/Kconfig.radio
index 136288b..ed662a4 100644
--- a/subsys/net/l2/ieee802154/Kconfig.radio
+++ b/subsys/net/l2/ieee802154/Kconfig.radio
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "IEEE 802.15.4 Radio"
 
diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig
index b2d1103..6ee9d48 100644
--- a/subsys/net/l2/openthread/Kconfig
+++ b/subsys/net/l2/openthread/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - OpenThread driver configuration options
-#
-#
+# OpenThread driver configuration options
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # OpenThread options
diff --git a/subsys/net/l2/ppp/Kconfig b/subsys/net/l2/ppp/Kconfig
index 6a1c607..31c8870 100644
--- a/subsys/net/l2/ppp/Kconfig
+++ b/subsys/net/l2/ppp/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_L2_PPP
 	bool "Enable point-to-point (PPP) support [EXPERIMENTAL]"
diff --git a/subsys/net/lib/Kconfig b/subsys/net/lib/Kconfig
index 3510a37..88c71df 100644
--- a/subsys/net/lib/Kconfig
+++ b/subsys/net/lib/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Network Protocols"
 
diff --git a/subsys/net/lib/coap/Kconfig b/subsys/net/lib/coap/Kconfig
index 5e577a9..1cee73f 100644
--- a/subsys/net/lib/coap/Kconfig
+++ b/subsys/net/lib/coap/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - CoAP implementation for Zephyr
+# CoAP implementation for Zephyr
 
-#
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config COAP
 	bool "CoAP Support"
diff --git a/subsys/net/lib/config/Kconfig b/subsys/net/lib/config/Kconfig
index be1449e..73aa1ea 100644
--- a/subsys/net/lib/config/Kconfig
+++ b/subsys/net/lib/config/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Options for networking configuration
+# Options for networking configuration
 
-#
 # Copyright (c) 2017 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config NET_CONFIG_AUTO_INIT
 	bool "Init networking support automatically during device startup"
diff --git a/subsys/net/lib/conn_mgr/Kconfig b/subsys/net/lib/conn_mgr/Kconfig
index 2932446..94775db 100644
--- a/subsys/net/lib/conn_mgr/Kconfig
+++ b/subsys/net/lib/conn_mgr/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_CONNECTION_MANAGER
 	bool "Enable network connection manager [EXPERIMENTAL]"
diff --git a/subsys/net/lib/dns/Kconfig b/subsys/net/lib/dns/Kconfig
index cb8be61..99430d5 100644
--- a/subsys/net/lib/dns/Kconfig
+++ b/subsys/net/lib/dns/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config DNS_RESOLVER
 	bool "DNS resolver"
diff --git a/subsys/net/lib/http/Kconfig b/subsys/net/lib/http/Kconfig
index 0f76718..be02982 100644
--- a/subsys/net/lib/http/Kconfig
+++ b/subsys/net/lib/http/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config HTTP_PARSER
 	bool "HTTP Parser support"
diff --git a/subsys/net/lib/lwm2m/Kconfig b/subsys/net/lib/lwm2m/Kconfig
index 445cf6d..13f73c5 100644
--- a/subsys/net/lib/lwm2m/Kconfig
+++ b/subsys/net/lib/lwm2m/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LWM2M
 	bool "OMA LWM2M protocol stack"
diff --git a/subsys/net/lib/lwm2m/Kconfig.ipso b/subsys/net/lib/lwm2m/Kconfig.ipso
index 8975561..d855355 100644
--- a/subsys/net/lib/lwm2m/Kconfig.ipso
+++ b/subsys/net/lib/lwm2m/Kconfig.ipso
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig LWM2M_IPSO_SUPPORT
 	bool "IPSO Alliance Smart Object Support"
diff --git a/subsys/net/lib/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig
index b8564b6..ad65acf 100644
--- a/subsys/net/lib/mqtt/Kconfig
+++ b/subsys/net/lib/mqtt/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Socket MQTT Library for Zephyr
-#
+# Socket MQTT Library for Zephyr
+
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config MQTT_LIB
 	bool "Socket MQTT Library Support"
diff --git a/subsys/net/lib/sntp/Kconfig b/subsys/net/lib/sntp/Kconfig
index 189178c..6f74c22 100644
--- a/subsys/net/lib/sntp/Kconfig
+++ b/subsys/net/lib/sntp/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2017 Linaro Limited
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SNTP
 	bool "SNTP"
diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
index f0708a2..99ba224 100644
--- a/subsys/net/lib/sockets/Kconfig
+++ b/subsys/net/lib/sockets/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - BSD Sockets compatible API
+# BSD Sockets compatible API
 
-#
 # Copyright (c) 2017 Linaro Limited.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig NET_SOCKETS
 	bool "BSD Sockets compatible API"
diff --git a/subsys/net/lib/socks/Kconfig b/subsys/net/lib/socks/Kconfig
index e05981a..b30e2ca 100644
--- a/subsys/net/lib/socks/Kconfig
+++ b/subsys/net/lib/socks/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Antmicro Ltd
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SOCKS
 	bool "SOCKS5 proxy"
diff --git a/subsys/net/lib/tls_credentials/Kconfig b/subsys/net/lib/tls_credentials/Kconfig
index e4942c7..bdff1a8 100644
--- a/subsys/net/lib/tls_credentials/Kconfig
+++ b/subsys/net/lib/tls_credentials/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig TLS_CREDENTIALS
 	bool "TLS credentials management"
diff --git a/subsys/net/lib/websocket/Kconfig b/subsys/net/lib/websocket/Kconfig
index 3ab3ac6..a61699d 100644
--- a/subsys/net/lib/websocket/Kconfig
+++ b/subsys/net/lib/websocket/Kconfig
@@ -1,7 +1,5 @@
 # Copyright (c) 2019 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig WEBSOCKET_CLIENT
 	bool "Websocket client support [EXPERIMENTAL]"
diff --git a/subsys/random/Kconfig b/subsys/random/Kconfig
index be62136..15cd84d 100644
--- a/subsys/random/Kconfig
+++ b/subsys/random/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - random configuration options
-#
+# Random configuration options
+
 # Copyright (c) 2017 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config TEST_RANDOM_GENERATOR
 	bool "Non-random number generator"
diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig
index 53eea05..366cf86 100644
--- a/subsys/settings/Kconfig
+++ b/subsys/settings/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SETTINGS
 	bool "Enable settings subsystem with non-volatile storage"
diff --git a/subsys/shell/Kconfig b/subsys/shell/Kconfig
index 399b71a..348191f 100644
--- a/subsys/shell/Kconfig
+++ b/subsys/shell/Kconfig
@@ -1,12 +1,9 @@
-# Kconfig - Shell configuration options
+# Shell configuration options
 
-#
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Intel Corporation
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SHELL
 	bool "Shell"
diff --git a/subsys/shell/Kconfig.backends b/subsys/shell/Kconfig.backends
index 1aa17eb..2eac1e0 100644
--- a/subsys/shell/Kconfig.backends
+++ b/subsys/shell/Kconfig.backends
@@ -1,10 +1,7 @@
-# Kconfig.backends - Shell badckends configuration options
+# Shell badckends configuration options
 
-#
 # Copyright (c) 2018 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig SHELL_BACKENDS
 	bool "Enable shell backends"
diff --git a/subsys/shell/modules/Kconfig b/subsys/shell/modules/Kconfig
index 25fb0c5..082bf88 100644
--- a/subsys/shell/modules/Kconfig
+++ b/subsys/shell/modules/Kconfig
@@ -1,11 +1,7 @@
-# Kconfig - Shell configuration options
+# Shell configuration options
 
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
-
 
 config KERNEL_SHELL
 	bool "Enable kernel shell"
diff --git a/subsys/storage/Kconfig b/subsys/storage/Kconfig
index 583339f..53cbf6c 100644
--- a/subsys/storage/Kconfig
+++ b/subsys/storage/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - Subsystem configuration options
-#
-# Copyright (c) 2018 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+# Subsystem configuration options
 
+# Copyright (c) 2018 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
 
 menu "Storage"
 
diff --git a/subsys/storage/flash_map/Kconfig b/subsys/storage/flash_map/Kconfig
index 6295a9d..8d3b022 100644
--- a/subsys/storage/flash_map/Kconfig
+++ b/subsys/storage/flash_map/Kconfig
@@ -1,9 +1,7 @@
-# Kconfig - Flash map abstraction module
-#
+# Flash map abstraction module
+
 # Copyright (c) 2017 Nordic Semiconductor ASA
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 #
 # Flash map
diff --git a/subsys/testsuite/Kconfig b/subsys/testsuite/Kconfig
index f80eb67..0c6614b 100644
--- a/subsys/testsuite/Kconfig
+++ b/subsys/testsuite/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "Testing"
 
diff --git a/subsys/testsuite/ztest/Kconfig b/subsys/testsuite/ztest/Kconfig
index 8e4aa73..0695bf0 100644
--- a/subsys/testsuite/ztest/Kconfig
+++ b/subsys/testsuite/ztest/Kconfig
@@ -1,8 +1,5 @@
-#
 # Copyright (c) 2016 Intel Corporation
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config ZTEST
 	bool "Zephyr testing framework"
diff --git a/subsys/usb/Kconfig b/subsys/usb/Kconfig
index cf30565..1e993fa 100644
--- a/subsys/usb/Kconfig
+++ b/subsys/usb/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - USB device stack configuration options
+# USB device stack configuration options
 
-#
 # Copyright (c) 2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menuconfig USB_DEVICE_STACK
 	bool "USB device stack"
diff --git a/subsys/usb/class/Kconfig b/subsys/usb/class/Kconfig
index 4ff2736..782473f 100644
--- a/subsys/usb/class/Kconfig
+++ b/subsys/usb/class/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - USB class drivers configuration options
+# USB class drivers configuration options
 
-#
 # Copyright (c) 2016 Wind River Systems, Inc.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_CDC_ACM
 	bool "USB CDC ACM Device Class Driver"
diff --git a/subsys/usb/class/Kconfig.template.composite_device_number b/subsys/usb/class/Kconfig.template.composite_device_number
index be7a20d..5d1368a 100644
--- a/subsys/usb/class/Kconfig.template.composite_device_number
+++ b/subsys/usb/class/Kconfig.template.composite_device_number
@@ -1,10 +1,8 @@
 # Kconfig template file for setting device count for
 # various USB classes.
-#
+
 # Copyright (c) 2019 Intel Corporation.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config $(module)_DEVICE_COUNT
 	int "Number of $(module) Devices"
diff --git a/subsys/usb/class/hid/Kconfig b/subsys/usb/class/hid/Kconfig
index 94cfdcf..7faffb3 100644
--- a/subsys/usb/class/hid/Kconfig
+++ b/subsys/usb/class/hid/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - USB HID configuration options
+# USB HID configuration options
 
-#
 # Copyright (c) 2018 Intel Corp.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config USB_DEVICE_HID
 	bool "USB Human Interface Device support"
diff --git a/subsys/usb/class/netusb/Kconfig b/subsys/usb/class/netusb/Kconfig
index 2cf7f8f..98a07b3 100644
--- a/subsys/usb/class/netusb/Kconfig
+++ b/subsys/usb/class/netusb/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - netusb configuration options
+# netusb configuration options
 
-#
 # Copyright (c) 2017 Intel Corp.
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 menu "USB Device Networking support"
 
diff --git a/tests/drivers/i2c/i2c_slave_api/common/Kconfig b/tests/drivers/i2c/i2c_slave_api/common/Kconfig
index a205570..7fdcc7f 100644
--- a/tests/drivers/i2c/i2c_slave_api/common/Kconfig
+++ b/tests/drivers/i2c/i2c_slave_api/common/Kconfig
@@ -1,10 +1,7 @@
-# Kconfig - I2C slave tests common configuration options
+# I2C slave tests common configuration options
 
-#
 # Copyright (c) 2017 BayLibre, SAS
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config I2C_VIRTUAL
 	bool "Virtual I2C Driver for Slave development"