You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2024/05/29 20:16:03 UTC
(nuttx) branch master updated: Fix Kconfig style
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new fde641fac9 Fix Kconfig style
fde641fac9 is described below
commit fde641fac98730dc3fe63d217e5d2b18abff76ab
Author: simbit18 <10...@users.noreply.github.com>
AuthorDate: Wed May 29 15:41:58 2024 +0200
Fix Kconfig style
correct block name board
Remove extra TABs
Add comments
---
arch/arm/src/gd32f4/Kconfig | 6 +-
arch/arm/src/rp2040/Kconfig | 231 ++++++++++++++-------------
arch/arm/src/sama5/Kconfig | 6 +-
boards/arm64/imx9/imx93-evk/Kconfig | 2 +-
boards/renesas/sh1/us7032evb1/Kconfig | 2 +-
boards/risc-v/esp32h2/esp32h2-devkit/Kconfig | 4 +-
boards/x86_64/intel64/qemu-intel64/Kconfig | 1 -
7 files changed, 127 insertions(+), 125 deletions(-)
diff --git a/arch/arm/src/gd32f4/Kconfig b/arch/arm/src/gd32f4/Kconfig
index c47c8d8021..9852b46a94 100644
--- a/arch/arm/src/gd32f4/Kconfig
+++ b/arch/arm/src/gd32f4/Kconfig
@@ -774,9 +774,9 @@ config GD32F4_ONESHOT_MAXTIMERS
timers that you can use.
# config GD32F4_TIMER0
-# bool "TIMER0"
-# default n
-# depend on GD32F4_HAVE_TIMER0
+# bool "TIMER0"
+# default n
+# depend on GD32F4_HAVE_TIMER0
config GD32F4_TIMER0_PWM
bool "TIMER0 PWM"
diff --git a/arch/arm/src/rp2040/Kconfig b/arch/arm/src/rp2040/Kconfig
index a03ac05029..7a977a16bf 100644
--- a/arch/arm/src/rp2040/Kconfig
+++ b/arch/arm/src/rp2040/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
- comment "RP2040 Configuration Options"
+comment "RP2040 Configuration Options"
config RP2040_DMAC
bool "DMAC support"
@@ -377,7 +377,6 @@ config RP2040_PWM2_PHASE_CORRECT
endif # RP2040_PWM2
-
config RP2040_PWM3
bool "PWM3"
---help---
@@ -684,34 +683,35 @@ if RP2040_CLK_GPOUT0
choice
prompt "Source Clock"
- config RP2040_CLK_GPOUT0_SRC_REF
- bool "REF (6 - 12 MHz)"
- ---help---
- Reference clock that is always running unless in DORMANT mode. Runs from
- Ring Oscillator (ROSC) at power-up but can be switched to Crystal
- Oscillator (XOSC) for more accuracy.
-
- config RP2040_CLK_GPOUT0_SRC_SYS
- bool "SYS (125 MHz)"
- ---help---
- System clock that is always running unless in DORMANT mode. Runs from
- clk_ref at power-up but is typically switched to a PLL.
-
- config RP2040_CLK_GPOUT0_SRC_USB
- bool "USB (48 MHz)"
- ---help---
- USB reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT0_SRC_ADC
- bool "ADC (48 MHz)"
- ---help---
- ADC reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT0_SRC_RTC
- bool "RTC (46875 Hz)"
- ---help---
- RTC reference clock. The RTC divides this clock to generate a 1 second reference.
-endchoice
+config RP2040_CLK_GPOUT0_SRC_REF
+ bool "REF (6 - 12 MHz)"
+ ---help---
+ Reference clock that is always running unless in DORMANT mode. Runs from
+ Ring Oscillator (ROSC) at power-up but can be switched to Crystal
+ Oscillator (XOSC) for more accuracy.
+
+config RP2040_CLK_GPOUT0_SRC_SYS
+ bool "SYS (125 MHz)"
+ ---help---
+ System clock that is always running unless in DORMANT mode. Runs from
+ clk_ref at power-up but is typically switched to a PLL.
+
+config RP2040_CLK_GPOUT0_SRC_USB
+ bool "USB (48 MHz)"
+ ---help---
+ USB reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT0_SRC_ADC
+ bool "ADC (48 MHz)"
+ ---help---
+ ADC reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT0_SRC_RTC
+ bool "RTC (46875 Hz)"
+ ---help---
+ RTC reference clock. The RTC divides this clock to generate a 1 second reference.
+
+endchoice # Source Clock
config RP2040_CLK_GPOUT0_DIVINT
int "Divisor (Integer)"
@@ -734,34 +734,35 @@ if RP2040_CLK_GPOUT1
choice
prompt "Source Clock"
- config RP2040_CLK_GPOUT1_SRC_REF
- bool "REF (6 - 12 MHz)"
- ---help---
- Reference clock that is always running unless in DORMANT mode. Runs from
- Ring Oscillator (ROSC) at power-up but can be switched to Crystal
- Oscillator (XOSC) for more accuracy.
-
- config RP2040_CLK_GPOUT1_SRC_SYS
- bool "SYS (125 MHz)"
- ---help---
- System clock that is always running unless in DORMANT mode. Runs from
- clk_ref at power-up but is typically switched to a PLL.
-
- config RP2040_CLK_GPOUT1_SRC_USB
- bool "USB (48 MHz)"
- ---help---
- USB reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT1_SRC_ADC
- bool "ADC (48 MHz)"
- ---help---
- ADC reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT1_SRC_RTC
- bool "RTC (46875 Hz)"
- ---help---
- RTC reference clock. The RTC divides this clock to generate a 1 second reference.
-endchoice
+config RP2040_CLK_GPOUT1_SRC_REF
+ bool "REF (6 - 12 MHz)"
+ ---help---
+ Reference clock that is always running unless in DORMANT mode. Runs from
+ Ring Oscillator (ROSC) at power-up but can be switched to Crystal
+ Oscillator (XOSC) for more accuracy.
+
+config RP2040_CLK_GPOUT1_SRC_SYS
+ bool "SYS (125 MHz)"
+ ---help---
+ System clock that is always running unless in DORMANT mode. Runs from
+ clk_ref at power-up but is typically switched to a PLL.
+
+config RP2040_CLK_GPOUT1_SRC_USB
+ bool "USB (48 MHz)"
+ ---help---
+ USB reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT1_SRC_ADC
+ bool "ADC (48 MHz)"
+ ---help---
+ ADC reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT1_SRC_RTC
+ bool "RTC (46875 Hz)"
+ ---help---
+ RTC reference clock. The RTC divides this clock to generate a 1 second reference.
+
+endchoice # Source Clock
config RP2040_CLK_GPOUT1_DIVINT
int "Divisor (Integer)"
@@ -784,34 +785,35 @@ if RP2040_CLK_GPOUT2
choice
prompt "Source Clock"
- config RP2040_CLK_GPOUT2_SRC_REF
- bool "REF (6 - 12 MHz)"
- ---help---
- Reference clock that is always running unless in DORMANT mode. Runs from
- Ring Oscillator (ROSC) at power-up but can be switched to Crystal
- Oscillator (XOSC) for more accuracy.
-
- config RP2040_CLK_GPOUT2_SRC_SYS
- bool "SYS (125 MHz)"
- ---help---
- System clock that is always running unless in DORMANT mode. Runs from
- clk_ref at power-up but is typically switched to a PLL.
-
- config RP2040_CLK_GPOUT2_SRC_USB
- bool "USB (48 MHz)"
- ---help---
- USB reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT2_SRC_ADC
- bool "ADC (48 MHz)"
- ---help---
- ADC reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT2_SRC_RTC
- bool "RTC (46875 Hz)"
- ---help---
- RTC reference clock. The RTC divides this clock to generate a 1 second reference.
-endchoice
+config RP2040_CLK_GPOUT2_SRC_REF
+ bool "REF (6 - 12 MHz)"
+ ---help---
+ Reference clock that is always running unless in DORMANT mode. Runs from
+ Ring Oscillator (ROSC) at power-up but can be switched to Crystal
+ Oscillator (XOSC) for more accuracy.
+
+config RP2040_CLK_GPOUT2_SRC_SYS
+ bool "SYS (125 MHz)"
+ ---help---
+ System clock that is always running unless in DORMANT mode. Runs from
+ clk_ref at power-up but is typically switched to a PLL.
+
+config RP2040_CLK_GPOUT2_SRC_USB
+ bool "USB (48 MHz)"
+ ---help---
+ USB reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT2_SRC_ADC
+ bool "ADC (48 MHz)"
+ ---help---
+ ADC reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT2_SRC_RTC
+ bool "RTC (46875 Hz)"
+ ---help---
+ RTC reference clock. The RTC divides this clock to generate a 1 second reference.
+
+endchoice # Source Clock
config RP2040_CLK_GPOUT2_DIVINT
int "Divisor (Integer)"
@@ -834,34 +836,35 @@ if RP2040_CLK_GPOUT3
choice
prompt "Source Clock"
- config RP2040_CLK_GPOUT3_SRC_REF
- bool "REF (6 - 12 MHz)"
- ---help---
- Reference clock that is always running unless in DORMANT mode. Runs from
- Ring Oscillator (ROSC) at power-up but can be switched to Crystal
- Oscillator (XOSC) for more accuracy.
-
- config RP2040_CLK_GPOUT3_SRC_SYS
- bool "SYS (125 MHz)"
- ---help---
- System clock that is always running unless in DORMANT mode. Runs from
- clk_ref at power-up but is typically switched to a PLL.
-
- config RP2040_CLK_GPOUT3_SRC_USB
- bool "USB (48 MHz)"
- ---help---
- USB reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT3_SRC_ADC
- bool "ADC (48 MHz)"
- ---help---
- ADC reference clock. Must be 48MHz.
-
- config RP2040_CLK_GPOUT3_SRC_RTC
- bool "RTC (46875 Hz)"
- ---help---
- RTC reference clock. The RTC divides this clock to generate a 1 second reference.
-endchoice
+config RP2040_CLK_GPOUT3_SRC_REF
+ bool "REF (6 - 12 MHz)"
+ ---help---
+ Reference clock that is always running unless in DORMANT mode. Runs from
+ Ring Oscillator (ROSC) at power-up but can be switched to Crystal
+ Oscillator (XOSC) for more accuracy.
+
+config RP2040_CLK_GPOUT3_SRC_SYS
+ bool "SYS (125 MHz)"
+ ---help---
+ System clock that is always running unless in DORMANT mode. Runs from
+ clk_ref at power-up but is typically switched to a PLL.
+
+config RP2040_CLK_GPOUT3_SRC_USB
+ bool "USB (48 MHz)"
+ ---help---
+ USB reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT3_SRC_ADC
+ bool "ADC (48 MHz)"
+ ---help---
+ ADC reference clock. Must be 48MHz.
+
+config RP2040_CLK_GPOUT3_SRC_RTC
+ bool "RTC (46875 Hz)"
+ ---help---
+ RTC reference clock. The RTC divides this clock to generate a 1 second reference.
+
+endchoice # Source Clock
config RP2040_CLK_GPOUT3_DIVINT
int "Divisor (Integer)"
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index 611baba875..5e03b6e6c4 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -5534,9 +5534,9 @@ endchoice # CS0 Memory Type
# depends on SAMA5_EBICS0_NAND
#
# config SAMA5_EBICS0_ECCNONE
-# bool "No ECC"
-# ---help---
-# Only raw transfers to/from NAND are supported
+# bool "No ECC"
+# ---help---
+# Only raw transfers to/from NAND are supported
#
# config SAMA5_EBICS0_SWECC
# bool "Software ECC"
diff --git a/boards/arm64/imx9/imx93-evk/Kconfig b/boards/arm64/imx9/imx93-evk/Kconfig
index 7a671a3a35..0e63f5a5cb 100644
--- a/boards/arm64/imx9/imx93-evk/Kconfig
+++ b/boards/arm64/imx9/imx93-evk/Kconfig
@@ -3,5 +3,5 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_IMX9QM_MEK
+if ARCH_BOARD_IMX93_EVK
endif
diff --git a/boards/renesas/sh1/us7032evb1/Kconfig b/boards/renesas/sh1/us7032evb1/Kconfig
index 0636ec5e34..6393bdbf6f 100644
--- a/boards/renesas/sh1/us7032evb1/Kconfig
+++ b/boards/renesas/sh1/us7032evb1/Kconfig
@@ -3,5 +3,5 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_TWR_K60N512
+if ARCH_BOARD_US7032EVB1
endif
diff --git a/boards/risc-v/esp32h2/esp32h2-devkit/Kconfig b/boards/risc-v/esp32h2/esp32h2-devkit/Kconfig
index 91a3b3330a..dfb818e6ab 100644
--- a/boards/risc-v/esp32h2/esp32h2-devkit/Kconfig
+++ b/boards/risc-v/esp32h2/esp32h2-devkit/Kconfig
@@ -3,6 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-if ARCH_BOARD_ESP32H2_GENERIC
+if ARCH_BOARD_ESP32H2_DEVKIT
-endif # ARCH_BOARD_ESP32H2_GENERIC
+endif # ARCH_BOARD_ESP32H2_DEVKIT
diff --git a/boards/x86_64/intel64/qemu-intel64/Kconfig b/boards/x86_64/intel64/qemu-intel64/Kconfig
index 9453e8ac8b..f72f3c094c 100644
--- a/boards/x86_64/intel64/qemu-intel64/Kconfig
+++ b/boards/x86_64/intel64/qemu-intel64/Kconfig
@@ -2,4 +2,3 @@
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
-#