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

Jump to bottom

[nrfconnect] Don't erase factory keys on the factory reset #12253

Merged
merged 2 commits into from
Nov 26, 2021
Merged

[nrfconnect] Don't erase factory keys on the factory reset #12253

merged 2 commits into from
Nov 26, 2021

Conversation

Damian-Nordic
Copy link
Contributor

Problem

The factory reset on nRF Connect platforms erases all settings starting with "mt/", including the factory settings.

Change overview

Make sure that factory configuration keys are not descendants of the "mt" subtree, so use "mt-fact" prefix for them.

Testing

Tested on nRF Connect platform.

@Damian-Nordic
[nrfconnect] Don't erase factory keys on the factory reset
1222b1f 
The factory reset on nRF Connect platforms erases all
settings starting with "mt/". Make sure that factory
configuration keys are not descendants of the "mt" subtree,
so use "mt-fact" prefix for them.
@restyled-io restyled-io bot mentioned this pull request Nov 25, 2021
Closed
@github-actions
Copy link

github-actions bot commented Nov 25, 2021 •
edited
Loading

PR #12253: Size comparison from c79b67b to 895adec

Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section c79b67b 895adec change % change
efr32 lighting-app BRD4161A (read only) 759184 759184 0 0.0
(read/write) 119812 119812 0 0.0
.bss 117988 117988 0 0.0
.data 1820 1820 0 0.0
.text 759176 759176 0 0.0
BRD4161A+rpc (read only) 746964 746964 0 0.0
(read/write) 136436 136436 0 0.0
.bss 134492 134492 0 0.0
.data 1944 1944 0 0.0
.text 746956 746956 0 0.0
lock-app BRD4161A (read only) 735120 735120 0 0.0
(read/write) 117524 117524 0 0.0
.bss 115748 115748 0 0.0
.data 1776 1776 0 0.0
.text 735112 735112 0 0.0
window-app BRD4161A (read only) 738560 738560 0 0.0
(read/write) 117884 117884 0 0.0
.bss 116100 116100 0 0.0
.data 1784 1784 0 0.0
.text 738552 738552 0 0.0
esp32 all-clusters-app c3devkit (read only) 835642 835642 0 0.0
(read/write) 1224282 1224282 0 0.0
.dram0.bss 59240 59240 0 0.0
.dram0.data 14100 14100 0 0.0
.flash.rodata 165680 165680 0 0.0
.flash.text 835642 835642 0 0.0
.iram0.text 61394 61394 0 0.0
m5stack (read only) 906987 906987 0 0.0
(read/write) 423532 423532 0 0.0
.dram0.bss 64632 64632 0 0.0
.dram0.data 34072 34072 0 0.0
.flash.rodata 193548 193548 0 0.0
.flash.text 901603 901603 0 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 720916 720916 0 0.0
.bss 78276 78276 0 0.0
.data 1956 1956 0 0.0
.text 634884 634884 0 0.0
lock-app k32w061+debug (read/write) 611236 611236 0 0.0
.bss 68716 68716 0 0.0
.data 1920 1920 0 0.0
.text 534800 534800 0 0.0
shell k32w061+debug (read/write) 676568 676568 0 0.0
.bss 79868 79868 0 0.0
.data 1892 1892 0 0.0
.text 589008 589008 0 0.0
linux all-clusters-app debug (read only) 1769433 1769433 0 0.0
(read/write) 131480 131480 0 0.0
.bss 60080 60080 0 0.0
.data 1170 1170 0 0.0
.data.rel.ro 64928 64928 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 576 576 0 0.0
.rodata 138325 138325 0 0.0
.text 1492738 1492738 0 0.0
bridge-app debug+rpc (read only) 1345293 1345293 0 0.0
(read/write) 77824 77824 0 0.0
.bss 41712 41712 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 29384 29384 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 112988 112988 0 0.0
.text 1132213 1132213 0 0.0
chip-tool debug (read only) 6005893 6005893 0 0.0
(read/write) 199664 199664 0 0.0
.bss 40064 40064 0 0.0
.data 2384 2384 0 0.0
.data.rel.ro 151632 151632 0 0.0
.dynamic 592 592 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 488 488 0 0.0
.rodata 283944 283944 0 0.0
.text 5333397 5333397 0 0.0
lighting-app debug+rpc (read only) 1618217 1618217 0 0.0
(read/write) 111072 111072 0 0.0
.bss 47408 47408 0 0.0
.data 1362 1362 0 0.0
.data.rel.ro 56976 56976 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 131249 131249 0 0.0
.text 1349250 1349250 0 0.0
ota-provider-app debug (read only) 1309361 1309361 0 0.0
(read/write) 76312 76312 0 0.0
.bss 44320 44320 0 0.0
.data 912 912 0 0.0
.data.rel.ro 25944 25944 0 0.0
.dynamic 592 592 0 0.0
.got 4048 4048 0 0.0
.init 27 27 0 0.0
.init_array 464 464 0 0.0
.rodata 114736 114736 0 0.0
.text 1094274 1094274 0 0.0
ota-requestor-app debug (read only) 1405849 1405849 0 0.0
(read/write) 80144 80144 0 0.0
.bss 46752 46752 0 0.0
.data 976 976 0 0.0
.data.rel.ro 27272 27272 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 488 488 0 0.0
.rodata 126176 126176 0 0.0
.text 1176530 1176530 0 0.0
shell debug (read only) 820129 820129 0 0.0
(read/write) 66936 66936 0 0.0
.bss 23496 23496 0 0.0
.data 338 338 0 0.0
.data.rel.ro 38560 38560 0 0.0
.dynamic 592 592 0 0.0
.got 3560 3560 0 0.0
.init 27 27 0 0.0
.init_array 360 360 0 0.0
.rodata 78927 78927 0 0.0
.text 634514 634514 0 0.0
tv-app debug (read only) 1915025 1915025 0 0.0
(read/write) 320088 320088 0 0.0
.bss 250168 250168 0 0.0
.data 2880 2880 0 0.0
.data.rel.ro 61368 61368 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 159240 159240 0 0.0
.text 1607586 1607586 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2293520 2293520 0 0.0
.bss 181788 181788 0 0.0
.data 5240 5240 0 0.0
.heap 849416 849416 0 0.0
.text 1256120 1256120 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2277552 2277552 0 0.0
.bss 172404 172404 0 0.0
.data 5600 5600 0 0.0
.heap 858440 858440 0 0.0
.text 1240152 1240152 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2251936 2251936 0 0.0
.bss 171220 171220 0 0.0
.data 5584 5584 0 0.0
.heap 859640 859640 0 0.0
.text 1214536 1214536 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2050800 2050800 0 0.0
.bss 156424 156424 0 0.0
.data 4984 4984 0 0.0
.heap 875040 875040 0 0.0
.text 1013400 1013400 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 873291 873291 0 0.0
bss 112644 112644 0 0.0
rodata 96676 96676 0 0.0
text 588304 588304 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 835819 835819 0 0.0
bss 108996 108996 0 0.0
rodata 87924 87924 0 0.0
text 562576 562576 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 798318 798318 0 0.0
bss 114020 114020 0 0.0
rodata 91936 91936 0 0.0
text 517764 517764 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 845447 845447 0 0.0
bss 109680 109680 0 0.0
rodata 92680 92680 0 0.0
text 567616 567616 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 770718 770718 0 0.0
bss 111088 111088 0 0.0
rodata 87968 87968 0 0.0
text 497172 497172 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 851547 851547 0 0.0
bss 109816 109816 0 0.0
rodata 94388 94388 0 0.0
text 571800 571800 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 845139 845139 0 0.0
bss 109712 109712 0 0.0
rodata 92636 92636 0 0.0
text 567236 567236 0 0.0
shell nrf52840dk_nrf52840 (read/write) 778327 778327 0 0.0
bss 109180 109180 0 0.0
rodata 72996 72996 0 0.0
text 521552 521552 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 693382 693382 0 0.0
bss 110164 110164 0 0.0
rodata 67640 67640 0 0.0
text 442160 442160 0 0.0
p6 all-clusters-app default (read/write) 2310328 2310328 0 0.0
.bss 114784 114784 0 0.0
.data 2544 2544 0 0.0
.heap 916016 916016 0 0.0
.text 1268592 1268592 0 0.0
lock-app default (read/write) 2222144 2222144 0 0.0
.bss 101080 101080 0 0.0
.data 2416 2416 0 0.0
.heap 929848 929848 0 0.0
.text 1180408 1180408 0 0.0
qpg lighting-app qpg6100+debug (read only) 500992 500992 0 0.0
(read/write) 114144 114144 0 0.0
.bss 50384 50384 0 0.0
.data 1024 1024 0 0.0
.text 495672 495672 0 0.0
lock-app qpg6100+debug (read only) 474960 474960 0 0.0
(read/write) 114140 114140 0 0.0
.bss 49256 49256 0 0.0
.data 980 980 0 0.0
.text 469640 469640 0 0.0
persistent-storage-app qpg6100+debug (read only) 105424 105424 0 0.0
(read/write) 114138 114138 0 0.0
.bss 12002 12002 0 0.0
.data 276 276 0 0.0
.text 100104 100104 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 774870 774870 0 0.0
bss 79216 79216 0 0.0
noinit 37160 37160 0 0.0
text 538758 538758 0 0.0

@andy31415
Copy link
Contributor

fast track: platform specific change created by a platform maintainer

@andy31415 andy31415 merged commit 67c8f1d into project-chip:master Nov 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msandstedt msandstedt msandstedt approved these changes

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chulspro chulspro Awaiting requested review from chulspro

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kghost kghost Awaiting requested review from kghost

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@pan-apple pan-apple Awaiting requested review from pan-apple

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
fast track platform review - pending zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Damian-Nordic @andy31415 @msandstedt @restyled-commits