Skip to content

Commit 61928bb

Browse files
kkasperczyk-nokkasperczyk-no
committed
[nrfconnect] Changed pm static configuration scheme
1 parent 5353036 commit 61928bb

File tree

81 files changed

+1140
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1140
-643
lines changed

‎examples/all-clusters-app/nrfconnect/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ get_filename_component(ENERGY_MANAGEMENT_COMMON_DIR ${CHIP_ROOT}/examples/energy
2323

2424
include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
2525

26-
if(DEFINED CONF_FILE AND NOT CONF_FILE STREQUAL "prj.conf")
27-
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
28-
endif()
29-
3026
list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
3127
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
3228

‎examples/all-clusters-app/nrfconnect/child_image/hci_rpmsg/prj.conf ‎examples/all-clusters-app/nrfconnect/child_image/hci_ipc/prj.conf

File renamed without changes.

‎examples/all-clusters-app/nrfconnect/child_image/hci_rpmsg/prj_no_dfu.conf ‎examples/all-clusters-app/nrfconnect/child_image/hci_ipc/prj_dfu.conf

File renamed without changes.

‎examples/all-clusters-app/nrfconnect/child_image/hci_rpmsg/prj_release.conf ‎examples/all-clusters-app/nrfconnect/child_image/hci_ipc/prj_release.conf

File renamed without changes.

‎examples/all-clusters-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf52840dk_nrf52840_dfu.yml

File renamed without changes.

‎examples/all-clusters-minimal-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf52840dk_nrf52840_release.yml

File renamed without changes.

‎examples/light-switch-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_dfu.yml

File renamed without changes.

‎examples/lighting-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml

File renamed without changes.

‎examples/all-clusters-app/nrfconnect/configuration/nrf7002dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp_dfu.yml

File renamed without changes.

‎examples/light-switch-app/nrfconnect/configuration/nrf7002dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp_release.yml

File renamed without changes.

‎examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ get_filename_component(ALL_CLUSTERS_COMMON_DIR ${CHIP_ROOT}/examples/all-cluster
2222

2323
include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
2424

25-
if(DEFINED CONF_FILE AND NOT CONF_FILE STREQUAL "prj.conf")
26-
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
27-
endif()
28-
2925
list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
3026
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
3127

‎examples/all-clusters-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf52840dk_nrf52840_dfu.yml

File renamed without changes.

‎examples/all-clusters-minimal-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf52840dk_nrf52840_release.yml

File renamed without changes.

‎examples/lit-icd-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_dfu.yml

File renamed without changes.

‎examples/lock-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/all-clusters-minimal-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml

File renamed without changes.

‎examples/light-switch-app/nrfconnect/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
2222

2323
include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
2424

25-
if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf")
26-
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
27-
endif()
28-
2925
list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
3026
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
3127

‎examples/light-switch-app/nrfconnect/child_image/hci_rpmsg/prj.conf ‎examples/light-switch-app/nrfconnect/child_image/hci_ipc/prj.conf

File renamed without changes.

‎examples/light-switch-app/nrfconnect/child_image/hci_rpmsg/prj_release.conf ‎examples/light-switch-app/nrfconnect/child_image/hci_ipc/prj_release.conf

File renamed without changes.

‎examples/light-switch-app/nrfconnect/child_image/hci_rpmsg/prj_no_dfu.conf

-25
This file was deleted.

‎examples/light-switch-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf

-25
This file was deleted.

‎examples/light-switch-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf52840dk_nrf52840.yml

File renamed without changes.

‎examples/lighting-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf52840dk_nrf52840_release.yml

File renamed without changes.

‎examples/pump-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp.yml

File renamed without changes.

‎examples/pump-controller-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml

File renamed without changes.

‎examples/lighting-app/nrfconnect/configuration/nrf7002dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp.yml

File renamed without changes.

‎examples/lock-app/nrfconnect/configuration/nrf7002dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/light-switch-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp_release.yml

File renamed without changes.

‎examples/light-switch-app/nrfconnect/prj_no_dfu.conf

-52
This file was deleted.

‎examples/lighting-app/nrfconnect/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
2222

2323
include(${CHIP_ROOT}/config/nrfconnect/app/check-nrfconnect-version.cmake)
2424

25-
if(NOT CONF_FILE STREQUAL "prj_no_dfu.conf" AND NOT BOARD STREQUAL "nrf52840dongle_nrf52840")
26-
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu.yml)
27-
endif()
28-
2925
list(APPEND ZEPHYR_EXTRA_MODULES ${CHIP_ROOT}/config/nrfconnect/chip-module)
3026
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
3127

‎examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840_no_dfu.conf ‎examples/lighting-app/nrfconnect/boards/nrf52840dongle_nrf52840.conf

+6
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,9 @@ CONFIG_PM_SINGLE_IMAGE=y
4141
# Disable factory data support.
4242
CONFIG_CHIP_FACTORY_DATA=n
4343
CONFIG_CHIP_FACTORY_DATA_BUILD=n
44+
45+
# Disable Matter OTA DFU
46+
CONFIG_CHIP_OTA_REQUESTOR=n
47+
48+
# Disable QSPI NOR
49+
CONFIG_CHIP_QSPI_NOR=n

‎examples/lighting-app/nrfconnect/child_image/hci_rpmsg/prj.conf ‎examples/lighting-app/nrfconnect/child_image/hci_ipc/prj.conf

File renamed without changes.

‎examples/lighting-app/nrfconnect/child_image/hci_rpmsg/prj_release.conf ‎examples/lighting-app/nrfconnect/child_image/hci_ipc/prj_release.conf

File renamed without changes.

‎examples/lighting-app/nrfconnect/child_image/hci_rpmsg/prj_no_dfu.conf

-25
This file was deleted.

‎examples/lighting-app/nrfconnect/child_image/multiprotocol_rpmsg/prj_no_dfu.conf

-25
This file was deleted.

‎examples/lit-icd-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/lighting-app/nrfconnect/pm_static_nrf52840dk_nrf52840.yml

File renamed without changes.

‎examples/lock-app/nrfconnect/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml ‎examples/lighting-app/nrfconnect/pm_static_nrf52840dk_nrf52840_release.yml

File renamed without changes.

‎examples/lighting-app/nrfconnect/pm_static_nrf52840dongle_nrf52840_no_dfu.yml ‎examples/lighting-app/nrfconnect/pm_static_nrf52840dongle_nrf52840.yml

File renamed without changes.

‎examples/window-app/nrfconnect/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml ‎examples/lighting-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp.yml

File renamed without changes.

‎examples/lighting-app/nrfconnect/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
mcuboot:
2+
address: 0x0
3+
size: 0x8000
4+
region: flash_primary
5+
mcuboot_pad:
6+
address: 0x8000
7+
size: 0x200
8+
app:
9+
address: 0x8200
10+
size: 0xf2e00
11+
mcuboot_primary:
12+
orig_span: &id001
13+
- mcuboot_pad
14+
- app
15+
span: *id001
16+
address: 0x8000
17+
size: 0xf3000
18+
region: flash_primary
19+
mcuboot_primary_app:
20+
orig_span: &id002
21+
- app
22+
span: *id002
23+
address: 0x8200
24+
size: 0xf2e00
25+
factory_data:
26+
address: 0xfb000
27+
size: 0x1000
28+
region: flash_primary
29+
settings_storage:
30+
address: 0xfc000
31+
size: 0x4000
32+
region: flash_primary
33+
mcuboot_primary_1:
34+
address: 0x0
35+
size: 0x40000
36+
device: flash_ctrl
37+
region: ram_flash
38+
mcuboot_secondary:
39+
address: 0x0
40+
size: 0xf3000
41+
device: MX25R64
42+
region: external_flash
43+
mcuboot_secondary_1:
44+
address: 0xf3000
45+
size: 0x40000
46+
device: MX25R64
47+
region: external_flash
48+
external_flash:
49+
address: 0x133000
50+
size: 0x6CD000
51+
device: MX25R64
52+
region: external_flash
53+
pcd_sram:
54+
address: 0x20000000
55+
size: 0x2000
56+
region: sram_primary

‎examples/lighting-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
mcuboot:
2+
address: 0x0
3+
size: 0xC000
4+
region: flash_primary
5+
mcuboot_pad:
6+
address: 0xC000
7+
size: 0x200
8+
app:
9+
address: 0xC200
10+
size: 0xeee00
11+
mcuboot_primary:
12+
orig_span: &id001
13+
- mcuboot_pad
14+
- app
15+
span: *id001
16+
address: 0xC000
17+
size: 0xef000
18+
region: flash_primary
19+
mcuboot_primary_app:
20+
orig_span: &id002
21+
- app
22+
span: *id002
23+
address: 0xC200
24+
size: 0xeee00
25+
factory_data:
26+
address: 0xfb000
27+
size: 0x1000
28+
region: flash_primary
29+
settings_storage:
30+
address: 0xfc000
31+
size: 0x4000
32+
region: flash_primary
33+
mcuboot_primary_1:
34+
address: 0x0
35+
size: 0x40000
36+
device: flash_ctrl
37+
region: ram_flash
38+
mcuboot_secondary:
39+
address: 0x0
40+
size: 0xef000
41+
device: MX25R64
42+
region: external_flash
43+
mcuboot_secondary_1:
44+
address: 0xef000
45+
size: 0x40000
46+
device: MX25R64
47+
region: external_flash
48+
external_flash:
49+
address: 0x12f000
50+
size: 0x6D1000
51+
device: MX25R64
52+
region: external_flash
53+
pcd_sram:
54+
address: 0x20000000
55+
size: 0x2000
56+
region: sram_primary

‎examples/lighting-app/nrfconnect/pm_static_nrf7002dk_nrf5340_cpuapp_release.yml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
mcuboot:
2+
address: 0x0
3+
size: 0xC000
4+
region: flash_primary
5+
mcuboot_pad:
6+
address: 0xC000
7+
size: 0x200
8+
app:
9+
address: 0xC200
10+
size: 0xeee00
11+
mcuboot_primary:
12+
orig_span: &id001
13+
- mcuboot_pad
14+
- app
15+
span: *id001
16+
address: 0xC000
17+
size: 0xef000
18+
region: flash_primary
19+
mcuboot_primary_app:
20+
orig_span: &id002
21+
- app
22+
span: *id002
23+
address: 0xC200
24+
size: 0xeee00
25+
factory_data:
26+
address: 0xfb000
27+
size: 0x1000
28+
region: flash_primary
29+
settings_storage:
30+
address: 0xfc000
31+
size: 0x4000
32+
region: flash_primary
33+
mcuboot_primary_1:
34+
address: 0x0
35+
size: 0x40000
36+
device: flash_ctrl
37+
region: ram_flash
38+
mcuboot_secondary:
39+
address: 0x0
40+
size: 0xef000
41+
device: MX25R64
42+
region: external_flash
43+
mcuboot_secondary_1:
44+
address: 0xef000
45+
size: 0x40000
46+
device: MX25R64
47+
region: external_flash
48+
external_flash:
49+
address: 0x12f000
50+
size: 0x6D1000
51+
device: MX25R64
52+
region: external_flash
53+
pcd_sram:
54+
address: 0x20000000
55+
size: 0x2000
56+
region: sram_primary

0 commit comments

Comments
 (0)