Skip to content

Commit

Permalink
[nrfconnect] Refactored configuration for the nrfconnect examples
Browse files Browse the repository at this point in the history
nrfconnect platform uses Kconfig overlays and defaults in a way
that is not consistent with the nRF Connect SDK recommendations

* Created Kconfig.defaults that set default configs common
for all examples (replaced sample-defaults.conf)
* Created Kconfig.features that allows to configure set
of options within single feature using single option
* Replaced approach of adding overlays in example cmake file
with the pattern of placing prj.conf files in a
configuration/build-target/ location that allows adding config
files to the build automatically by the toolchain.
* Created debug and release configuration variants for several
examples.
  • Loading branch information
kkasperczyk-no committed Mar 29, 2022
1 parent a19de20 commit 8124085
Show file tree
Hide file tree
Showing 115 changed files with 2,469 additions and 713 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ jobs:
- name: Build example nRF Connect SDK All Clusters App on nRF52840 DK
timeout-minutes: 10
run: |
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840 -DBUILD_WITH_DFU=1
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840 -DCONFIG_CHIP_OTA_REQUESTOR=y
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
nrfconnect nrf52840dk_nrf52840 all-clusters-app \
examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
Expand Down
40 changes: 0 additions & 40 deletions config/nrfconnect/app/overlay-multi_image_smp_dfu_support.conf

This file was deleted.

40 changes: 0 additions & 40 deletions config/nrfconnect/app/overlay-single_image_smp_dfu_support.conf

This file was deleted.

1 change: 0 additions & 1 deletion config/nrfconnect/app/overlay-usb_support.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ CONFIG_USB_UART_CONSOLE=y

CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_UART_LINE_CTRL=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
122 changes: 0 additions & 122 deletions config/nrfconnect/app/sample-defaults.conf

This file was deleted.

1 change: 1 addition & 0 deletions config/nrfconnect/chip-module/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ config CHIP_NFC_COMMISSIONING
config CHIP_OTA_REQUESTOR
bool
imply DFU_TARGET
imply BOOTLOADER_MCUBOOT
imply IMG_MANAGER
imply STREAM_FLASH
imply STREAM_FLASH_ERASE
Expand Down
Loading

0 comments on commit 8124085

Please sign in to comment.