From d0a6f682d12cfb7232c73345e0dd5c22281b2999 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Mon, 18 Nov 2019 12:01:42 +0100 Subject: [PATCH] kconfig: Fix up newly-introduced copy-pasted headers Same deal as in https://github.com/zephyrproject-rtos/zephyr/pull/20280, for newly-introduced stuff. Will avoid failures with the new CI test in https://github.com/zephyrproject-rtos/ci-tools/pull/112, though it only checks changed files. Also fix some un-indented properties on choices. Choice properties work the same as symbol properties syntactically. Signed-off-by: Ulf Magnusson --- boards/arm/decawave_dwm1001_dev/Kconfig | 5 ++--- boards/arm/decawave_dwm1001_dev/Kconfig.board | 7 +++---- boards/arm/decawave_dwm1001_dev/Kconfig.defconfig | 5 ++--- boards/arm/nrf52833_pca10100/Kconfig | 5 ++--- boards/arm/nrf52833_pca10100/Kconfig.board | 7 +++---- boards/arm/nrf52833_pca10100/Kconfig.defconfig | 5 ++--- boards/arm/twr_kv58f220m/Kconfig.board | 5 ++--- boards/arm/twr_kv58f220m/Kconfig.defconfig | 6 ++---- drivers/dma/Kconfig.stm32 | 7 ++----- drivers/entropy/Kconfig.rv32m1 | 5 ++--- drivers/spi/Kconfig.rv32m1_lpspi | 6 ++---- drivers/timer/Kconfig.stm32_lptim | 6 ++---- soc/arm/atmel_sam0/samd51/Kconfig.defconfig.series | 4 ++-- soc/arm/atmel_sam0/samd51/Kconfig.series | 4 ++-- soc/arm/atmel_sam0/samd51/Kconfig.soc | 8 ++++---- soc/arm/atmel_sam0/same51/Kconfig.defconfig.series | 4 ++-- soc/arm/atmel_sam0/same51/Kconfig.series | 4 ++-- soc/arm/atmel_sam0/same51/Kconfig.soc | 8 ++++---- soc/arm/atmel_sam0/same53/Kconfig.defconfig.series | 4 ++-- soc/arm/atmel_sam0/same53/Kconfig.series | 4 ++-- soc/arm/atmel_sam0/same53/Kconfig.soc | 8 ++++---- soc/arm/atmel_sam0/same54/Kconfig.defconfig.series | 4 ++-- soc/arm/atmel_sam0/same54/Kconfig.series | 4 ++-- soc/arm/atmel_sam0/same54/Kconfig.soc | 8 ++++---- soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA | 9 +++------ soc/arm/nxp_kinetis/kv5x/Kconfig.series | 6 ++---- soc/arm/st_stm32/common/Kconfig.soc | 2 +- 27 files changed, 64 insertions(+), 86 deletions(-) diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig b/boards/arm/decawave_dwm1001_dev/Kconfig index 1ebdf394f74..b81c893ac22 100644 --- a/boards/arm/decawave_dwm1001_dev/Kconfig +++ b/boards/arm/decawave_dwm1001_dev/Kconfig @@ -1,7 +1,6 @@ -# Kconfig - DecaWave DWM1001 DEV board configuration -# +# DecaWave DWM1001 DEV board configuration + # Copyright (c) 2019 Stéphane D'Alu -# # SPDX-License-Identifier: Apache-2.0 if BOARD_DECAWAVE_DWM1001_DEV diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.board b/boards/arm/decawave_dwm1001_dev/Kconfig.board index 3ba82698fe2..ebfd2c581bc 100644 --- a/boards/arm/decawave_dwm1001_dev/Kconfig.board +++ b/boards/arm/decawave_dwm1001_dev/Kconfig.board @@ -1,9 +1,8 @@ -# Kconfig - DecaWave DWM1001 board configuration -# +# DecaWave DWM1001 board configuration + # Copyright (c) 2019 Stéphane D'Alu -# # SPDX-License-Identifier: Apache-2.0 -config BOARD_DECAWAVE_DWM1001_DEV +config BOARD_DECAWAVE_DWM1001_DEV bool "Decawave DWM1001-DEV" depends on SOC_NRF52832_QFAA diff --git a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig index a6952fc54e0..86cb0f264e1 100644 --- a/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig +++ b/boards/arm/decawave_dwm1001_dev/Kconfig.defconfig @@ -1,7 +1,6 @@ -# Kconfig - DecaWave DWM1001 board configuration -# +# DecaWave DWM1001 board configuration + # Copyright (c) 2019 Stéphane D'Alu -# # SPDX-License-Identifier: Apache-2.0 if BOARD_DECAWAVE_DWM1001_DEV diff --git a/boards/arm/nrf52833_pca10100/Kconfig b/boards/arm/nrf52833_pca10100/Kconfig index 43c3c2814ca..8e183a590e7 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig +++ b/boards/arm/nrf52833_pca10100/Kconfig @@ -1,7 +1,6 @@ -# Kconfig - nRF52833 PCA10100 board configuration -# +# nRF52833 PCA10100 board configuration + # Copyright (c) 2019 Nordic Semiconductor ASA -# # SPDX-License-Identifier: Apache-2.0 if BOARD_NRF52833_PCA10100 diff --git a/boards/arm/nrf52833_pca10100/Kconfig.board b/boards/arm/nrf52833_pca10100/Kconfig.board index f8aee0dd511..d6d8508236e 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig.board +++ b/boards/arm/nrf52833_pca10100/Kconfig.board @@ -1,9 +1,8 @@ -# Kconfig - nRF52833 PCA10100 board configuration -# +# nRF52833 PCA10100 board configuration + # Copyright (c) 2019 Nordic Semiconductor ASA -# # SPDX-License-Identifier: Apache-2.0 -config BOARD_NRF52833_PCA10100 +config BOARD_NRF52833_PCA10100 bool "NRF52833 PCA10100" depends on SOC_NRF52833_QIAA diff --git a/boards/arm/nrf52833_pca10100/Kconfig.defconfig b/boards/arm/nrf52833_pca10100/Kconfig.defconfig index 407f7f1d37c..81110ead5c7 100644 --- a/boards/arm/nrf52833_pca10100/Kconfig.defconfig +++ b/boards/arm/nrf52833_pca10100/Kconfig.defconfig @@ -1,7 +1,6 @@ -# Kconfig - nRF52833 PCA10100 board configuration -# +# nRF52833 PCA10100 board configuration + # Copyright (c) 2019 Nordic Semiconductor ASA -# # SPDX-License-Identifier: Apache-2.0 if BOARD_NRF52833_PCA10100 diff --git a/boards/arm/twr_kv58f220m/Kconfig.board b/boards/arm/twr_kv58f220m/Kconfig.board index f57fa0b9ed8..a5ee3947f3f 100644 --- a/boards/arm/twr_kv58f220m/Kconfig.board +++ b/boards/arm/twr_kv58f220m/Kconfig.board @@ -1,7 +1,6 @@ -# Kconfig - TWR-KV58F220M board configuration -# +# TWR-KV58F220M board configuration + # Copyright (c) 2019 SEAL AG -# # SPDX-License-Identifier: Apache-2.0 config BOARD_TWR_KV58F220M diff --git a/boards/arm/twr_kv58f220m/Kconfig.defconfig b/boards/arm/twr_kv58f220m/Kconfig.defconfig index 7d3630a74fe..b4b4405f9e9 100644 --- a/boards/arm/twr_kv58f220m/Kconfig.defconfig +++ b/boards/arm/twr_kv58f220m/Kconfig.defconfig @@ -1,9 +1,7 @@ -# Kconfig - TWR-KV58F220M board -# +# TWR-KV58F220M board + # Copyright (c) 2019 SEAL AG -# # SPDX-License-Identifier: Apache-2.0 -# if BOARD_TWR_KV58F220M diff --git a/drivers/dma/Kconfig.stm32 b/drivers/dma/Kconfig.stm32 index 04ae082e081..444408c87da 100644 --- a/drivers/dma/Kconfig.stm32 +++ b/drivers/dma/Kconfig.stm32 @@ -1,11 +1,8 @@ -# Kconfig - DMA configuration options -# -# +# DMA configuration options + # Copyright (c) 2016 Intel Corporation # Copyright (c) 2019 Song Qiang -# # SPDX-License-Identifier: Apache-2.0 -# config DMA_STM32 bool "Enable STM32 DMA driver" diff --git a/drivers/entropy/Kconfig.rv32m1 b/drivers/entropy/Kconfig.rv32m1 index 91431ef93e5..41d9acf54dc 100644 --- a/drivers/entropy/Kconfig.rv32m1 +++ b/drivers/entropy/Kconfig.rv32m1 @@ -1,7 +1,6 @@ -# Kconfig.rv32m1 - RV32M1 entropy generator driver configuration -# +# RV32M1 entropy generator driver configuration + # Copyright 2019 NXP -# # SPDX-License-Identifier: Apache-2.0 menuconfig ENTROPY_RV32M1_TRNG diff --git a/drivers/spi/Kconfig.rv32m1_lpspi b/drivers/spi/Kconfig.rv32m1_lpspi index 4f5b2df27d8..4b030ca4899 100644 --- a/drivers/spi/Kconfig.rv32m1_lpspi +++ b/drivers/spi/Kconfig.rv32m1_lpspi @@ -1,9 +1,7 @@ -# Kconfig - RV32M1 SPI -# +# RV32M1 SPI + # Copyright (c) 2019, Karsten Koenig -# # SPDX-License-Identifier: Apache-2.0 -# config SPI_RV32M1_LPSPI bool "RV32M1 LPSPI driver" diff --git a/drivers/timer/Kconfig.stm32_lptim b/drivers/timer/Kconfig.stm32_lptim index 60bc484e792..2b39faac883 100644 --- a/drivers/timer/Kconfig.stm32_lptim +++ b/drivers/timer/Kconfig.stm32_lptim @@ -1,9 +1,7 @@ -# Kconfig - STM32 LPTIM configuration options -# +# STM32 LPTIM configuration options + # Copyright (c) 2019 STMicroelectronics -# # SPDX-License-Identifier: Apache-2.0 -# menuconfig STM32_LPTIM_TIMER bool "STM32 Low Power Timer" diff --git a/soc/arm/atmel_sam0/samd51/Kconfig.defconfig.series b/soc/arm/atmel_sam0/samd51/Kconfig.defconfig.series index 2f7c7dba0a5..03e28af16d9 100644 --- a/soc/arm/atmel_sam0/samd51/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam0/samd51/Kconfig.defconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAMD51 MCU series configuration options -# +# Atmel SAMD51 MCU series configuration options + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/samd51/Kconfig.series b/soc/arm/atmel_sam0/samd51/Kconfig.series index 4767c1538e7..5a08a83d1db 100644 --- a/soc/arm/atmel_sam0/samd51/Kconfig.series +++ b/soc/arm/atmel_sam0/samd51/Kconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAMD51 MCU series -# +# Atmel SAMD51 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/samd51/Kconfig.soc b/soc/arm/atmel_sam0/samd51/Kconfig.soc index 61aa96d52a0..043ccdcab1a 100644 --- a/soc/arm/atmel_sam0/samd51/Kconfig.soc +++ b/soc/arm/atmel_sam0/samd51/Kconfig.soc @@ -1,11 +1,11 @@ -# Kconfig - Atmel SAMD51 MCU series -# +# Atmel SAMD51 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 choice -prompt "Atmel SAMD51 MCU Selection" -depends on SOC_SERIES_SAMD51 + prompt "Atmel SAMD51 MCU Selection" + depends on SOC_SERIES_SAMD51 config SOC_PART_NUMBER_SAMD51G18A bool "SAMD51G18A" diff --git a/soc/arm/atmel_sam0/same51/Kconfig.defconfig.series b/soc/arm/atmel_sam0/same51/Kconfig.defconfig.series index 1e3c182370d..b4492229c71 100644 --- a/soc/arm/atmel_sam0/same51/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam0/same51/Kconfig.defconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME51 MCU series configuration options -# +# Atmel SAME51 MCU series configuration options + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same51/Kconfig.series b/soc/arm/atmel_sam0/same51/Kconfig.series index 525b9d1c4ca..d9521e06c36 100644 --- a/soc/arm/atmel_sam0/same51/Kconfig.series +++ b/soc/arm/atmel_sam0/same51/Kconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME51 MCU series -# +# Atmel SAME51 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same51/Kconfig.soc b/soc/arm/atmel_sam0/same51/Kconfig.soc index e65caf2b5b4..08b3db89456 100644 --- a/soc/arm/atmel_sam0/same51/Kconfig.soc +++ b/soc/arm/atmel_sam0/same51/Kconfig.soc @@ -1,11 +1,11 @@ -# Kconfig - Atmel SAME51 MCU series -# +# Atmel SAME51 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 choice -prompt "Atmel SAME51 MCU Selection" -depends on SOC_SERIES_SAME51 + prompt "Atmel SAME51 MCU Selection" + depends on SOC_SERIES_SAME51 config SOC_PART_NUMBER_SAME51J18A bool "SAME51J18A" diff --git a/soc/arm/atmel_sam0/same53/Kconfig.defconfig.series b/soc/arm/atmel_sam0/same53/Kconfig.defconfig.series index 1224ac29381..d88346e5b45 100644 --- a/soc/arm/atmel_sam0/same53/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam0/same53/Kconfig.defconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME53 MCU series configuration options -# +# Atmel SAME53 MCU series configuration options + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same53/Kconfig.series b/soc/arm/atmel_sam0/same53/Kconfig.series index 23235301483..744916f18ab 100644 --- a/soc/arm/atmel_sam0/same53/Kconfig.series +++ b/soc/arm/atmel_sam0/same53/Kconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME53 MCU series -# +# Atmel SAME53 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same53/Kconfig.soc b/soc/arm/atmel_sam0/same53/Kconfig.soc index 9a5dfaefb41..f59797204fe 100644 --- a/soc/arm/atmel_sam0/same53/Kconfig.soc +++ b/soc/arm/atmel_sam0/same53/Kconfig.soc @@ -1,11 +1,11 @@ -# Kconfig - Atmel SAME53 MCU series -# +# Atmel SAME53 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 choice -prompt "Atmel SAME53 MCU Selection" -depends on SOC_SERIES_SAME53 + prompt "Atmel SAME53 MCU Selection" + depends on SOC_SERIES_SAME53 config SOC_PART_NUMBER_SAME53J18A bool "SAME53J18A" diff --git a/soc/arm/atmel_sam0/same54/Kconfig.defconfig.series b/soc/arm/atmel_sam0/same54/Kconfig.defconfig.series index 988c40b23df..4d2486a0075 100644 --- a/soc/arm/atmel_sam0/same54/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam0/same54/Kconfig.defconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME MCU series configuration options -# +# Atmel SAME MCU series configuration options + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same54/Kconfig.series b/soc/arm/atmel_sam0/same54/Kconfig.series index 1a8dd150d7b..3b8070f9839 100644 --- a/soc/arm/atmel_sam0/same54/Kconfig.series +++ b/soc/arm/atmel_sam0/same54/Kconfig.series @@ -1,5 +1,5 @@ -# Kconfig - Atmel SAME54 MCU series -# +# Atmel SAME54 MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 diff --git a/soc/arm/atmel_sam0/same54/Kconfig.soc b/soc/arm/atmel_sam0/same54/Kconfig.soc index eaebb5cea6c..35db63eab80 100644 --- a/soc/arm/atmel_sam0/same54/Kconfig.soc +++ b/soc/arm/atmel_sam0/same54/Kconfig.soc @@ -1,11 +1,11 @@ -# Kconfig - Atmel SAME MCU series -# +# Atmel SAME MCU series + # Copyright (c) 2019 ML!PA Consulting GmbH # SPDX-License-Identifier: Apache-2.0 choice -prompt "Atmel SAME54 MCU Selection" -depends on SOC_SERIES_SAME54 + prompt "Atmel SAME54 MCU Selection" + depends on SOC_SERIES_SAME54 config SOC_PART_NUMBER_SAME54N19A bool "SAME54N19A" diff --git a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA index db805dfca61..8108024e0e0 100644 --- a/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA +++ b/soc/arm/nordic_nrf/nrf52/Kconfig.defconfig.nrf52833_QIAA @@ -1,10 +1,7 @@ -# Kconfig.defconfig.nrf52833 - Nordic Semiconductor nRF52833 MCU -# -# Copyright (c) 2019 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: Apache-2.0 -# +# Nordic Semiconductor nRF52833 MCU +# Copyright (c) 2019 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 if SOC_NRF52833_QIAA diff --git a/soc/arm/nxp_kinetis/kv5x/Kconfig.series b/soc/arm/nxp_kinetis/kv5x/Kconfig.series index 6ab41d40fca..496f6152cc8 100644 --- a/soc/arm/nxp_kinetis/kv5x/Kconfig.series +++ b/soc/arm/nxp_kinetis/kv5x/Kconfig.series @@ -1,9 +1,7 @@ -# Kconfig - Kinetis KV5x series MCU -# +# Kinetis KV5x series MCU + # Copyright (c) 2019 SEAL AG -# # SPDX-License-Identifier: Apache-2.0 -# config SOC_SERIES_KINETIS_KV5X bool "Kinetis KV5x Series MCU" diff --git a/soc/arm/st_stm32/common/Kconfig.soc b/soc/arm/st_stm32/common/Kconfig.soc index 10e1b792fa9..98c71a41cd1 100644 --- a/soc/arm/st_stm32/common/Kconfig.soc +++ b/soc/arm/st_stm32/common/Kconfig.soc @@ -1,4 +1,4 @@ -# Kconfig - ST Microelectronics Common Kconfig +# ST Microelectronics Common Kconfig # Copyright (c) 2019 Linaro Ltd. # SPDX-License-Identifier: Apache-2.0