Skip to content

Commit

Permalink
kconfig: Clean up header comments and make them consistent
Browse files Browse the repository at this point in the history
Use this short header style in all Kconfig files:

    # <description>

    # <copyright>
    # <license>

    ...

Also change all <description>s from

    # Kconfig[.extension] - Foo-related options

to just

    # Foo-related options

It's clear enough that it's about Kconfig.

The <description> cleanup was done with this command, along with some
manual cleanup (big letter at the start, etc.)

    git ls-files '*Kconfig*' | \
        xargs sed -i -E '1 s/#\s*Kconfig[\w.-]*\s*-\s*/# /'

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
  • Loading branch information
ulfalizer authored and nashif committed Nov 4, 2019
1 parent 86360cb commit bd6e044
Show file tree
Hide file tree
Showing 1,169 changed files with 1,769 additions and 4,167 deletions.
6 changes: 2 additions & 4 deletions Kconfig
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 1 addition & 4 deletions Kconfig.zephyr
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
5 changes: 1 addition & 4 deletions arch/Kconfig
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 0 additions & 3 deletions arch/arc/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions arch/arc/core/mpu/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 1 addition & 5 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/core/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/core/cortex_m/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/core/cortex_m/mpu/Kconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 1 addition & 3 deletions arch/arm/core/cortex_m/tz/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/core/cortex_r/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions arch/nios2/Kconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
#
# Copyright (c) 2016 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

menu "Nios II Options"
depends on NIOS2
Expand Down
5 changes: 1 addition & 4 deletions arch/posix/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions arch/riscv/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions arch/x86/core/Kconfig.ia32
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions arch/x86/core/Kconfig.intel64
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions arch/xtensa/Kconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 1 addition & 4 deletions boards/arc/em_starterkit/Kconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 3 additions & 4 deletions boards/arc/em_starterkit/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions boards/arc/emsdp/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions boards/arc/emsdp/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 3 additions & 4 deletions boards/arc/hsdk/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions boards/arc/hsdk/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#
# Copyright (c) 2019 Synopsys, Inc. All rights reserved.
#
# SPDX-License-Identifier: Apache-2.0

if BOARD_HSDK
Expand Down
7 changes: 3 additions & 4 deletions boards/arc/iotdk/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions boards/arc/nsim/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions boards/arm/96b_argonkey/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
6 changes: 2 additions & 4 deletions boards/arm/96b_argonkey/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 2 additions & 4 deletions boards/arm/96b_avenger96/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 2 additions & 4 deletions boards/arm/96b_avenger96/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 2 additions & 4 deletions boards/arm/96b_carbon/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
6 changes: 2 additions & 4 deletions boards/arm/96b_carbon/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 2 additions & 3 deletions boards/arm/96b_carbon_nrf51/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 2 additions & 3 deletions boards/arm/96b_carbon_nrf51/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions boards/arm/96b_meerkat96/Kconfig.board
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading

0 comments on commit bd6e044

Please sign in to comment.