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.

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

Fix NFC enabling #17373

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Fix NFC enabling #17373

merged 2 commits into from
Apr 14, 2022

Conversation

doru91
Copy link
Contributor

@doru91 doru91 commented Apr 14, 2022

Problem

  • both CONFIG_CHIP_NFC_COMMISSIONING and CHIP_DEVICE_CONFIG_ENABLE_NFC needs to be set in order to enable NFC functionality;
  • until now, only CHIP_DEVICE_CONFIG_ENABLE_NFC was set if chip_enable_nfc was true
  • probably we should keep a single define, but this should be addressed in a separate PR

Change overview

  • set both NFC defines when chip_enable_nfc is true.

Testing

  • compiled both with chip_enable_nfc enabled and disabled.

Set all the defines required for NFC if chip_enable_nfc is true.

Signed-off-by: Doru Gucea <doru-cristian.gucea@nxp.com>
@restyled-io restyled-io bot mentioned this pull request Apr 14, 2022
@github-actions
Copy link

github-actions bot commented Apr 14, 2022

PR #17373: Size comparison from 912527c to 3520810

Decreases (2 builds for k32w)
platform target config section 912527c 3520810 change % change
k32w light k32w061+release (read/write) 686876 683976 -2900 -0.4
.bss 78136 77952 -184 -0.2
.data 2036 1992 -44 -2.2
.text 600904 598232 -2672 -0.4
lock k32w061+release (read/write) 691320 688204 -3116 -0.5
.bss 78712 78528 -184 -0.2
.data 1996 1952 -44 -2.2
.text 604812 601924 -2888 -0.5
Full report (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 912527c 3520810 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 683351 683351 0 0.0
(read/write) 169840 169840 0 0.0
.bss 76176 76176 0 0.0
.data 3380 3380 0 0.0
.rodata 102975 102975 0 0.0
.text 579896 579896 0 0.0
lock-ftd LP_CC2652R7 (read only) 639823 639823 0 0.0
(read/write) 151220 151220 0 0.0
.bss 74152 74152 0 0.0
.data 3212 3212 0 0.0
.rodata 79951 79951 0 0.0
.text 559380 559380 0 0.0
lock-mtd LP_CC2652R7 (read only) 588567 588567 0 0.0
(read/write) 146940 146940 0 0.0
.bss 69872 69872 0 0.0
.data 3212 3212 0 0.0
.rodata 79831 79831 0 0.0
.text 508244 508244 0 0.0
pump-app LP_CC2652R7 (read only) 648571 648571 0 0.0
(read/write) 152516 152516 0 0.0
.bss 74648 74648 0 0.0
.data 3244 3244 0 0.0
.rodata 75435 75435 0 0.0
.text 572648 572648 0 0.0
pump-controller-app LP_CC2652R7 (read only) 641871 641871 0 0.0
(read/write) 152184 152184 0 0.0
.bss 74352 74352 0 0.0
.data 3208 3208 0 0.0
.rodata 78767 78767 0 0.0
.text 562616 562616 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 618458 618458 0 0.0
.app_xip_area 525160 525160 0 0.0
.bss 75964 75964 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 576058 576058 0 0.0
.app_xip_area 484296 484296 0 0.0
.bss 74460 74460 0 0.0
.data 648 648 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 565234 565234 0 0.0
.app_xip_area 463844 463844 0 0.0
.bss 83792 83792 0 0.0
.data 564 564 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 907396 907396 0 0.0
(read/write) 133152 133152 0 0.0
.bss 131112 131112 0 0.0
.data 2040 2040 0 0.0
.text 907388 907388 0 0.0
BRD4161A+rpc (read only) 941772 941772 0 0.0
(read/write) 149836 149836 0 0.0
.bss 147592 147592 0 0.0
.data 2244 2244 0 0.0
.text 941764 941764 0 0.0
window-app BRD4161A (read only) 844052 844052 0 0.0
(read/write) 131156 131156 0 0.0
.bss 129208 129208 0 0.0
.data 1948 1948 0 0.0
.text 844044 844044 0 0.0
esp32 all-clusters-app c3devkit (read only) 979666 979666 0 0.0
(read/write) 1397410 1397410 0 0.0
.dram0.bss 62632 62632 0 0.0
.dram0.data 14420 14420 0 0.0
.flash.rodata 201432 201432 0 0.0
.flash.text 979666 979666 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1035075 1035075 0 0.0
(read/write) 465164 465164 0 0.0
.dram0.bss 68152 68152 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 231024 231024 0 0.0
.flash.text 1029691 1029691 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 686876 683976 -2900 -0.4
.bss 78136 77952 -184 -0.2
.data 2036 1992 -44 -2.2
.text 600904 598232 -2672 -0.4
lock k32w061+release (read/write) 691320 688204 -3116 -0.5
.bss 78712 78528 -184 -0.2
.data 1996 1952 -44 -2.2
.text 604812 601924 -2888 -0.5
linux all-clusters-app debug (read only) 2698161 2698161 0 0.0
(read/write) 149280 149280 0 0.0
.bss 60224 60224 0 0.0
.data 1888 1888 0 0.0
.data.rel.ro 81080 81080 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 984 984 0 0.0
.rodata 232485 232485 0 0.0
.text 2291586 2291586 0 0.0
bridge-app debug+rpc (read only) 1837805 1837805 0 0.0
(read/write) 91856 91856 0 0.0
.bss 44480 44480 0 0.0
.data 2912 2912 0 0.0
.data.rel.ro 39376 39376 0 0.0
.dynamic 592 592 0 0.0
.got 3936 3936 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 148569 148569 0 0.0
.text 1570805 1570805 0 0.0
chip-tool debug (read only) 10719333 10719333 0 0.0
(read/write) 371832 371832 0 0.0
.bss 22752 22752 0 0.0
.data 1104 1104 0 0.0
.data.rel.ro 341728 341728 0 0.0
.dynamic 624 624 0 0.0
.got 4936 4936 0 0.0
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 539221 539221 0 0.0
.text 9350805 9350805 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10343140 10343140 0 0.0
(read/write) 492273 492273 0 0.0
.bss 41025 41025 0 0.0
.data 1168 1168 0 0.0
.data.rel.ro 388840 388840 0 0.0
.dynamic 560 560 0 0.0
.got 57440 57440 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 513204 513204 0 0.0
.text 8726516 8726516 0 0.0
door-lock-app debug (read only) 2109057 2109057 0 0.0
(read/write) 119600 119600 0 0.0
.bss 48064 48064 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 64504 64504 0 0.0
.dynamic 592 592 0 0.0
.got 4264 4264 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 186761 186761 0 0.0
.text 1766594 1766594 0 0.0
lighting-app debug+rpc (read only) 2313705 2313705 0 0.0
(read/write) 127984 127984 0 0.0
.bss 50304 50304 0 0.0
.data 1952 1952 0 0.0
.data.rel.ro 69992 69992 0 0.0
.dynamic 608 608 0 0.0
.got 4320 4320 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 182665 182665 0 0.0
.text 1965106 1965106 0 0.0
ota-provider-app debug (read only) 2046217 2046217 0 0.0
(read/write) 115296 115296 0 0.0
.bss 48224 48224 0 0.0
.data 1608 1608 0 0.0
.data.rel.ro 59720 59720 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 172611 172611 0 0.0
.text 1717394 1717394 0 0.0
ota-requestor-app debug (read only) 2076681 2076681 0 0.0
(read/write) 118392 118392 0 0.0
.bss 48960 48960 0 0.0
.data 1864 1864 0 0.0
.data.rel.ro 61960 61960 0 0.0
.dynamic 592 592 0 0.0
.got 4304 4304 0 0.0
.init 27 27 0 0.0
.init_array 656 656 0 0.0
.rodata 169484 169484 0 0.0
.text 1749138 1749138 0 0.0
shell debug (read only) 2525953 2525953 0 0.0
(read/write) 150064 150064 0 0.0
.bss 67624 67624 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 75464 75464 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 214802 214802 0 0.0
.text 2149986 2149986 0 0.0
thermostat-no-ble arm64 (read only) 2353652 2353652 0 0.0
(read/write) 151137 151137 0 0.0
.bss 63169 63169 0 0.0
.data 1424 1424 0 0.0
.data.rel.ro 78752 78752 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 144612 144612 0 0.0
.text 1980384 1980384 0 0.0
tv-app debug (read only) 2798433 2798433 0 0.0
(read/write) 250816 250816 0 0.0
.bss 164144 164144 0 0.0
.data 4448 4448 0 0.0
.data.rel.ro 76008 76008 0 0.0
.dynamic 592 592 0 0.0
.got 4688 4688 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 213451 213451 0 0.0
.text 2403682 2403682 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2368820 2368820 0 0.0
.bss 185244 185244 0 0.0
.data 5840 5840 0 0.0
.text 1331420 1331420 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1162867 1162867 0 0.0
bss 136536 136536 0 0.0
rodata 147092 147092 0 0.0
text 800624 800624 0 0.0
p6 all-clusters-app default (read/write) 2514624 2514624 0 0.0
.bss 118648 118648 0 0.0
.data 2768 2768 0 0.0
.text 1472888 1472888 0 0.0
light-app default (read/write) 2415080 2415080 0 0.0
.bss 112144 112144 0 0.0
.data 2576 2576 0 0.0
.text 1373344 1373344 0 0.0
lock-app default (read/write) 2378648 2378648 0 0.0
.bss 111888 111888 0 0.0
.data 2536 2536 0 0.0
.text 1336912 1336912 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 800852 800852 0 0.0
bss 69996 69996 0 0.0
noinit 40416 40416 0 0.0
text 569742 569742 0 0.0

@Damian-Nordic Damian-Nordic merged commit 01e54b2 into project-chip:master Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants