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] Move VID & PID configuration to Kconfig #15195

Merged
merged 1 commit into from
Feb 16, 2022
Merged

[nrfconnect] Move VID & PID configuration to Kconfig #15195

merged 1 commit into from
Feb 16, 2022

Conversation

Damian-Nordic
Copy link
Contributor

Problem

nRF Connect applications should configure Vendor ID and Product ID via Kconfig to generate correct OTA images at build time.

Change overview

Move vendor and product IDs in nRF Connect examples from CHIPProjectConfig.h to Kconfig. Kconfig values both set the CHIP defines and are additionally passed to the OTA image generation script.

Testing

Verified with nRF Connect lock-app that expected VID & PID are used:

I: 454 [DL]  Vendor Id: 65521 (0xFFF1)
I: 458 [DL]  Product Id: 32774 (0x8006)

@Damian-Nordic
[nrfconnect] Move VID & PID configuration to Kconfig
378c7d5 
Move vendor and product IDs in nRF Connect examples from
CHIPProjectConfig.h to Kconfig. Kconfig values set both
the CHIP defines and are additionally passed to the OTA
image generation script.
@Damian-Nordic Damian-Nordic mentioned this pull request Feb 15, 2022
Closed
@github-actions
Copy link

github-actions bot commented Feb 15, 2022 •
edited
Loading

PR #15195: Size comparison from a35b95a to 378c7d5

Full report (43 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section a35b95a 378c7d5 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 593150 593150 0 0.0
.app_xip_area 498772 498772 0 0.0
.bss 77076 77076 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 551210 551210 0 0.0
.app_xip_area 458400 458400 0 0.0
.bss 75548 75548 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 569726 569726 0 0.0
.app_xip_area 467660 467660 0 0.0
.bss 84476 84476 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 909912 909912 0 0.0
(read/write) 127240 127240 0 0.0
.bss 125208 125208 0 0.0
.data 2032 2032 0 0.0
.text 909904 909904 0 0.0
BRD4161A+rpc (read only) 938632 938632 0 0.0
(read/write) 144160 144160 0 0.0
.bss 141984 141984 0 0.0
.data 2172 2172 0 0.0
.text 938624 938624 0 0.0
window-app BRD4161A (read only) 845156 845156 0 0.0
(read/write) 125300 125300 0 0.0
.bss 123400 123400 0 0.0
.data 1900 1900 0 0.0
.text 845148 845148 0 0.0
esp32 all-clusters-app c3devkit (read only) 945792 945792 0 0.0
(read/write) 1398562 1398562 0 0.0
.dram0.bss 66248 66248 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199144 199144 0 0.0
.flash.text 945792 945792 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 995651 995651 0 0.0
(read/write) 463840 463840 0 0.0
.dram0.bss 71392 71392 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226256 226256 0 0.0
.flash.text 990267 990267 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 683848 683848 0 0.0
.bss 76512 76512 0 0.0
.data 1904 1904 0 0.0
.text 599632 599632 0 0.0
lock k32w061+release (read/write) 689396 689396 0 0.0
.bss 76904 76904 0 0.0
.data 1948 1948 0 0.0
.text 604744 604744 0 0.0
linux all-clusters-app debug (read only) 2361649 2361649 0 0.0
(read/write) 140288 140288 0 0.0
.bss 54816 54816 0 0.0
.data 1296 1296 0 0.0
.data.rel.ro 78504 78504 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 205861 205861 0 0.0
.text 1993442 1993442 0 0.0
bridge-app debug+rpc (read only) 1727965 1727965 0 0.0
(read/write) 84200 84200 0 0.0
.bss 38928 38928 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38080 38080 0 0.0
.dynamic 592 592 0 0.0
.got 3976 3976 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 141836 141836 0 0.0
.text 1469509 1469509 0 0.0
chip-tool debug (read only) 8552101 8552101 0 0.0
(read/write) 245952 245952 0 0.0
.bss 31816 31816 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 206896 206896 0 0.0
.dynamic 608 608 0 0.0
.got 4792 4792 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 459509 459509 0 0.0
.text 7576101 7576101 0 0.0
chip-tool-ipv6only arm64 (read only) 8312388 8312388 0 0.0
(read/write) 353729 353729 0 0.0
.bss 50113 50113 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 249368 249368 0 0.0
.dynamic 560 560 0 0.0
.got 49240 49240 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 435500 435500 0 0.0
.text 7114260 7114260 0 0.0
door-lock-app debug (read only) 1933265 1933265 0 0.0
(read/write) 110104 110104 0 0.0
.bss 41616 41616 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62080 62080 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 173298 173298 0 0.0
.text 1611378 1611378 0 0.0
lighting-app debug+rpc (read only) 2056945 2056945 0 0.0
(read/write) 115448 115448 0 0.0
.bss 42720 42720 0 0.0
.data 1400 1400 0 0.0
.data.rel.ro 65832 65832 0 0.0
.dynamic 608 608 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 165649 165649 0 0.0
.text 1736482 1736482 0 0.0
ota-provider-app debug (read only) 1866049 1866049 0 0.0
(read/write) 105848 105848 0 0.0
.bss 41504 41504 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57480 57480 0 0.0
.dynamic 608 608 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 157835 157835 0 0.0
.text 1557554 1557554 0 0.0
ota-requestor-app debug (read only) 1861489 1861489 0 0.0
(read/write) 106904 106904 0 0.0
.bss 41760 41760 0 0.0
.data 1160 1160 0 0.0
.data.rel.ro 58536 58536 0 0.0
.dynamic 592 592 0 0.0
.got 4176 4176 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 151420 151420 0 0.0
.text 1561154 1561154 0 0.0
shell debug (read only) 2343209 2343209 0 0.0
(read/write) 141616 141616 0 0.0
.bss 61920 61920 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73192 73192 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 206738 206738 0 0.0
.text 1979618 1979618 0 0.0
thermostat-no-ble arm64 (read only) 2152684 2152684 0 0.0
(read/write) 140337 140337 0 0.0
.bss 57169 57169 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75024 75024 0 0.0
.dynamic 560 560 0 0.0
.got 4144 4144 0 0.0
.init 24 24 0 0.0
.init_array 328 328 0 0.0
.rodata 133020 133020 0 0.0
.text 1801408 1801408 0 0.0
tv-app debug (read only) 2530809 2530809 0 0.0
(read/write) 140960 140960 0 0.0
.bss 58720 58720 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73008 73008 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 197669 197669 0 0.0
.text 2160098 2160098 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2398544 2398544 0 0.0
.bss 188252 188252 0 0.0
.data 5320 5320 0 0.0
.text 1361144 1361144 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2360768 2360768 0 0.0
.bss 180864 180864 0 0.0
.data 5624 5624 0 0.0
.text 1323368 1323368 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2324368 2324368 0 0.0
.bss 180752 180752 0 0.0
.data 5600 5600 0 0.0
.text 1286968 1286968 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139648 1139648 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103032 103032 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2309324 2309324 0 0.0
.bss 178004 178004 0 0.0
.data 5424 5424 0 0.0
.text 1271896 1271896 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1016735 1016735 0 0.0
bss 121272 121272 0 0.0
rodata 120204 120204 0 0.0
text 696284 696284 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 986011 986011 0 0.0
bss 118460 118460 0 0.0
rodata 111728 111728 0 0.0
text 676172 676172 0 0.0
nrf52840dongle_nrf52840 (read/write) 1032595 1032595 0 0.0
bss 122660 122660 0 0.0
rodata 119084 119084 0 0.0
text 700904 700904 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 923378 923378 0 0.0
bss 117836 117836 0 0.0
rodata 113444 113444 0 0.0
text 611300 611300 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 946463 946463 0 0.0
bss 119644 119644 0 0.0
rodata 108964 108964 0 0.0
text 639316 639316 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 853990 853990 0 0.0
bss 116236 116236 0 0.0
rodata 102136 102136 0 0.0
text 555108 555108 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 945279 945279 0 0.0
bss 119364 119364 0 0.0
rodata 107916 107916 0 0.0
text 639372 639372 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 941227 941227 0 0.0
bss 119368 119368 0 0.0
rodata 107616 107616 0 0.0
text 635612 635612 0 0.0
shell nrf52840dk_nrf52840 (read/write) 807147 807147 0 0.0
bss 111216 111216 0 0.0
rodata 79104 79104 0 0.0
text 539244 539244 0 0.0
p6 all-clusters-app default (read/write) 2484072 2484072 0 0.0
.bss 117608 117608 0 0.0
.data 2672 2672 0 0.0
.text 1442336 1442336 0 0.0
light-app default (read/write) 2390920 2390920 0 0.0
.bss 107248 107248 0 0.0
.data 2520 2520 0 0.0
.text 1349184 1349184 0 0.0
lock-app default (read/write) 2354384 2354384 0 0.0
.bss 106976 106976 0 0.0
.data 2480 2480 0 0.0
.text 1312648 1312648 0 0.0
qpg lighting-app qpg6105+debug (read only) 595624 595624 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88904 88904 0 0.0
.data 1108 1108 0 0.0
.text 590304 590304 0 0.0
lock-app qpg6105+debug (read only) 561360 561360 0 0.0
(read/write) 146936 146936 0 0.0
.bss 88888 88888 0 0.0
.data 1060 1060 0 0.0
.text 556040 556040 0 0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 875938 875938 0 0.0
bss 88580 88580 0 0.0
noinit 37160 37160 0 0.0
text 615704 615704 0 0.0

@Damian-Nordic Damian-Nordic merged commit d671a52 into project-chip:master Feb 16, 2022
@Damian-Nordic Damian-Nordic deleted the nrf-vid-pid branch February 16, 2022 07:43
jamesluo11 pushed a commit to jamesluo11/connectedhomeip that referenced this pull request Apr 26, 2022
@Damian-Nordic @fuxingguo16
[nrfconnect] Move VID & PID configuration to Kconfig (project-chip#15195
86a6b8e 
)

Move vendor and product IDs in nRF Connect examples from
CHIPProjectConfig.h to Kconfig. Kconfig values set both
the CHIP defines and are additionally passed to the OTA
image generation script.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@saurabhst saurabhst saurabhst approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

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

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

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

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

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

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

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

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

@msandstedt msandstedt Awaiting requested review from msandstedt

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

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@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

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

Assignees
No one assigned
Labels
examples review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Damian-Nordic @saurabhst @bzbarsky-apple @jmartinez-silabs