Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrfconnect] Refactored configuration for the nrfconnect examples #16991

Merged
merged 1 commit into from
Apr 5, 2022
Merged

[nrfconnect] Refactored configuration for the nrfconnect examples #16991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/.wordlist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ dcc
DCHIP
DCL
DCMAKE
DCONF
DCONFIG
debianutils
debugText
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-nrfconnect.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
timeout-minutes: 20
run: |
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=../../rpc.overlay
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
nrfconnect nrf52840dk_nrf52840+rpc lighting-app \
examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
Expand Down 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 -DCONF_FILE=prj_dfu.conf
.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
22 changes: 0 additions & 22 deletions config/nrfconnect/app/overlay-mcuboot_qspi_nor_support.conf
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions config/nrfconnect/app/overlay-multi_image_smp_dfu_support.conf
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions config/nrfconnect/app/overlay-ota_requestor.conf
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions config/nrfconnect/app/overlay-single_image_smp_dfu_support.conf
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion config/nrfconnect/app/overlay-usb_support.conf
View file
Open in desktop
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"
37 changes: 0 additions & 37 deletions config/nrfconnect/app/release.conf
View file
Open in desktop

This file was deleted.

122 changes: 0 additions & 122 deletions config/nrfconnect/app/sample-defaults.conf
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions config/nrfconnect/chip-module/Kconfig
View file
Open in desktop
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