From 01704380d3fd96f716fb3bae370eb085f54633fe Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Sat, 19 Oct 2024 13:15:50 +0200 Subject: [PATCH] boards/arm/nrf52/nrf52832-dk: replace some configs with jumbo config replace some configs with jumbo config nrf52832-dk --- .../arm/nrf52/boards/nrf52832-dk/index.rst | 14 +++-- .../nrf52832-dk/configs/buttons/defconfig | 51 ------------------- .../configs/{timer => jumbo}/defconfig | 4 ++ .../nrf52/nrf52832-dk/configs/wdog/defconfig | 45 ---------------- 4 files changed, 10 insertions(+), 104 deletions(-) delete mode 100644 boards/arm/nrf52/nrf52832-dk/configs/buttons/defconfig rename boards/arm/nrf52/nrf52832-dk/configs/{timer => jumbo}/defconfig (92%) delete mode 100644 boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst index 7e7bb5f11e..f63015ef32 100644 --- a/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst +++ b/Documentation/platforms/arm/nrf52/boards/nrf52832-dk/index.rst @@ -71,10 +71,13 @@ follow:: Where is one of the following: -buttons -------- +jumbo +----- -This configuration shows the use of the buttons subsystem. +This configuration enables many Apache NuttX features. This is +mostly to help provide additional code coverage in CI, but also +allows for a users to see a wide range of features that are +supported by the OS. nsh ---- @@ -99,8 +102,3 @@ sdc_nimble Enables Nordic's SoftDevice controller and uses nimBLE for the host-layer. The ``nimble`` test application can be used to enable a simple GATT server. - -wdog ----- -This configuration is a simple NSH-based test of the nRF52 watchdog -timer driver using the test at ``apps/examples/watchdog``. diff --git a/boards/arm/nrf52/nrf52832-dk/configs/buttons/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/buttons/defconfig deleted file mode 100644 index abd9c9210d..0000000000 --- a/boards/arm/nrf52/nrf52832-dk/configs/buttons/defconfig +++ /dev/null @@ -1,51 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_ARCH_FPU is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="nrf52832-dk" -CONFIG_ARCH_BOARD_NRF52832_DK=y -CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52832=y -CONFIG_ARCH_CHIP_NRF52=y -CONFIG_ARCH_IRQBUTTONS=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_LOOPSPERMSEC=5500 -CONFIG_BUILTIN=y -CONFIG_EXAMPLES_BUTTONS=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INPUT=y -CONFIG_INPUT_BUTTONS=y -CONFIG_INPUT_BUTTONS_LOWER=y -CONFIG_INTELHEX_BINARY=y -CONFIG_MM_REGIONS=2 -CONFIG_NRF52_GPIOTE=y -CONFIG_NRF52_UART0=y -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_RAM_SIZE=65535 -CONFIG_RAM_START=0x20000000 -CONFIG_RAW_BINARY=y -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=26 -CONFIG_START_MONTH=3 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/jumbo/defconfig similarity index 92% rename from boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig rename to boards/arm/nrf52/nrf52832-dk/configs/jumbo/defconfig index 2aeb152a31..2dd90a8071 100644 --- a/boards/arm/nrf52/nrf52832-dk/configs/timer/defconfig +++ b/boards/arm/nrf52/nrf52832-dk/configs/jumbo/defconfig @@ -12,14 +12,17 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52832-dk" CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NRF52832_DK=y +CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52832=y CONFIG_ARCH_CHIP_NRF52=y +CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_BUILTIN=y CONFIG_EXAMPLES_TIMER=y +CONFIG_EXAMPLES_WATCHDOG=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y @@ -27,6 +30,7 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 CONFIG_NRF52_TIMER1=y CONFIG_NRF52_UART0=y +CONFIG_NRF52_WDT=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 diff --git a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig deleted file mode 100644 index 8af59f5655..0000000000 --- a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_ARCH_FPU is not set -# CONFIG_NSH_DISABLE_IFCONFIG is not set -# CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="nrf52832-dk" -CONFIG_ARCH_BOARD_NRF52832_DK=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52832=y -CONFIG_ARCH_CHIP_NRF52=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_LOOPSPERMSEC=5500 -CONFIG_BUILTIN=y -CONFIG_EXAMPLES_WATCHDOG=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_MM_REGIONS=2 -CONFIG_NRF52_UART0=y -CONFIG_NRF52_WDT=y -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_TIMERS=4 -CONFIG_RAM_SIZE=65535 -CONFIG_RAM_START=0x20000000 -CONFIG_RAW_BINARY=y -CONFIG_RR_INTERVAL=200 -CONFIG_SCHED_WAITPID=y -CONFIG_START_DAY=26 -CONFIG_START_MONTH=3 -CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=0 -CONFIG_UART0_SERIAL_CONSOLE=y