From 56b50a2267783f246d854b3741685e40d2415059 Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Sat, 19 Oct 2024 13:22:04 +0200 Subject: [PATCH] boards/arm/nrf52/nrf52840-dk: replace some configs with jumbo config replace some configs with jumbo config for nrf52840-dk --- .../arm/nrf52/boards/nrf52840-dk/index.rst | 29 +++-------- .../nrf52/nrf52840-dk/configs/adc/defconfig | 49 ------------------ .../nrf52840-dk/configs/buttons/defconfig | 51 ------------------- .../configs/{pwm => jumbo}/defconfig | 17 +++++++ .../nrf52/nrf52840-dk/configs/qspi/defconfig | 45 ---------------- .../nrf52/nrf52840-dk/configs/timer/defconfig | 47 ----------------- 6 files changed, 23 insertions(+), 215 deletions(-) delete mode 100644 boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig delete mode 100644 boards/arm/nrf52/nrf52840-dk/configs/buttons/defconfig rename boards/arm/nrf52/nrf52840-dk/configs/{pwm => jumbo}/defconfig (78%) delete mode 100644 boards/arm/nrf52/nrf52840-dk/configs/qspi/defconfig delete mode 100644 boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig diff --git a/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst b/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst index f48585f774a08..762ad0f8e2a56 100644 --- a/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst +++ b/Documentation/platforms/arm/nrf52/boards/nrf52840-dk/index.rst @@ -60,15 +60,13 @@ follow:: Where is one of the following: -adc ----- - -This configuration shows the use of the ADC peripheral. - -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. cdcacm ------- @@ -97,16 +95,6 @@ ostest_tickless This is a NSH configuration that includes ``apps/testing/ostest`` as a builtin and enable support for the tick-less OS. -pwm ---- - -This configuration shows the use of the PWM peripheral. - -qspi ----- - -NuttShell configuration with enabled support for on-board MX25R QSPI memory. - rndis ----- @@ -129,11 +117,6 @@ sx127x NuttShell configuration with support for sx127x chip. -timer ------- - -This configuration shows the use of the TIMER peripheral. - usbnsh ------ diff --git a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig deleted file mode 100644 index ff508bb85a586..0000000000000 --- a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig +++ /dev/null @@ -1,49 +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_ADC=y -CONFIG_ANALOG=y -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD="nrf52840-dk" -CONFIG_ARCH_BOARD_NRF52840_DK=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52840=y -CONFIG_ARCH_CHIP_NRF52=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_LOOPSPERMSEC=5500 -CONFIG_BUILTIN=y -CONFIG_EXAMPLES_ADC=y -CONFIG_EXAMPLES_ADC_NSAMPLES=4 -CONFIG_EXAMPLES_ADC_SWTRIG=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_MM_REGIONS=2 -CONFIG_NRF52_SAADC=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/nrf52840-dk/configs/buttons/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/buttons/defconfig deleted file mode 100644 index 8332f5ce4d034..0000000000000 --- a/boards/arm/nrf52/nrf52840-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="nrf52840-dk" -CONFIG_ARCH_BOARD_NRF52840_DK=y -CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52840=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/nrf52840-dk/configs/pwm/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/jumbo/defconfig similarity index 78% rename from boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig rename to boards/arm/nrf52/nrf52840-dk/configs/jumbo/defconfig index e2faab88ba417..472d119fe43bb 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/jumbo/defconfig @@ -8,29 +8,46 @@ # CONFIG_ARCH_FPU is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set +CONFIG_ADC=y +CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52840-dk" +CONFIG_ARCH_BOARD_COMMON=y CONFIG_ARCH_BOARD_NRF52840_DK=y +CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52840=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_ADC=y +CONFIG_EXAMPLES_ADC_NSAMPLES=4 +CONFIG_EXAMPLES_ADC_SWTRIG=y CONFIG_EXAMPLES_PWM=y +CONFIG_EXAMPLES_TIMER=y +CONFIG_EXAMPLES_WATCHDOG=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FS_FAT=y +CONFIG_FS_LITTLEFS=y CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_MM_REGIONS=2 +CONFIG_MTD=y +CONFIG_MTD_MX25RXX=y CONFIG_NRF52_PWM0=y CONFIG_NRF52_PWM0_CH0=y CONFIG_NRF52_PWM0_CH1=y CONFIG_NRF52_PWM0_CH2=y CONFIG_NRF52_PWM0_CH3=y CONFIG_NRF52_PWM_MULTICHAN=y +CONFIG_NRF52_QSPI=y +CONFIG_NRF52_SAADC=y +CONFIG_NRF52_TIMER2=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/nrf52840-dk/configs/qspi/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/qspi/defconfig deleted file mode 100644 index 3de3258fa1925..0000000000000 --- a/boards/arm/nrf52/nrf52840-dk/configs/qspi/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="nrf52840-dk" -CONFIG_ARCH_BOARD_NRF52840_DK=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52840=y -CONFIG_ARCH_CHIP_NRF52=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_LOOPSPERMSEC=5500 -CONFIG_DEBUG_SYMBOLS=y -CONFIG_FS_LITTLEFS=y -CONFIG_IDLETHREAD_STACKSIZE=2048 -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_INIT_STACKSIZE=4098 -CONFIG_MM_REGIONS=2 -CONFIG_MTD=y -CONFIG_MTD_MX25RXX=y -CONFIG_NRF52_QSPI=y -CONFIG_NRF52_UART0=y -CONFIG_NSH_ARCHINIT=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/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig deleted file mode 100644 index 83ef63d85cde5..0000000000000 --- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig +++ /dev/null @@ -1,47 +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="nrf52840-dk" -CONFIG_ARCH_BOARD_COMMON=y -CONFIG_ARCH_BOARD_NRF52840_DK=y -CONFIG_ARCH_CHIP="nrf52" -CONFIG_ARCH_CHIP_NRF52840=y -CONFIG_ARCH_CHIP_NRF52=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_STDARG_H=y -CONFIG_BOARD_LOOPSPERMSEC=5500 -CONFIG_BUILTIN=y -CONFIG_EXAMPLES_TIMER=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FS_FAT=y -CONFIG_INIT_ENTRYPOINT="nsh_main" -CONFIG_MM_REGIONS=2 -CONFIG_NRF52_RTC0=y -CONFIG_NRF52_TIMER2=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