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

[QPG] Allow overrule of PID/VID/Version at build time #22787

Merged
merged 1 commit into from
Sep 21, 2022
Merged

[QPG] Allow overrule of PID/VID/Version at build time #22787

merged 1 commit into from
Sep 21, 2022

Conversation

tima-q
Copy link
Contributor

@tima-q tima-q commented Sep 21, 2022 •
edited
Loading

Issue Being Resolved

Change overview

Add build-time options to gn flow to overrule basic defines in CHIPProjectConfig.h
Values also require to propagate to further tooling steps like OTA image generation.
Doubles for easy switching of VID/PID for costumer use.

@tima-q tima-q added the qpg QPG6xxx platform label Sep 21, 2022
@tima-q
* Allow overrule of PID/VID/Version at build time
7f00bab 
  Used for customer development and simple OTA test image creation
@tima-q tima-q force-pushed the qpg/allow_overrides_at_build_time branch from 870887e to 7f00bab Compare September 21, 2022 08:38
@github-actions github-actions bot removed the platform label Sep 21, 2022
@github-actions
Copy link

github-actions bot commented Sep 21, 2022 •
edited
Loading

PR #22787: Size comparison from 3aa138f to 7f00bab

Increases (6 builds for bl702, psoc6, telink)
platform target config section 3aa138f 7f00bab change % change
bl702 lighting-app bl702 .debug_info 37896039 37896041 2 0.0
.text 956818 956822 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 26817149 26817150 1 0.0
lock cy8ckit_062s2_43012 .debug_info 22397448 22397449 1 0.0
telink light-switch-app tlsr9518adk80d (read/write) 814460 814468 8 0.0
text 574564 574568 4 0.0
lighting-app tlsr9518adk80d (read/write) 836416 836424 8 0.0
text 592724 592728 4 0.0
ota-requestor-app tlsr9518adk80d text 598966 598968 2 0.0
Decreases (2 builds for esp32, psoc6)
platform target config section 3aa138f 7f00bab change % change
esp32 all-clusters-app c3devkit (read only) 1222930 1222926 -4 -0.0
.flash.text 1222930 1222926 -4 -0.0
psoc6 light cy8ckit_062s2_43012 .debug_info 22018112 22018111 -1 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 3aa138f 7f00bab change % change
bl602 lighting-app bl602 (read/write) 1383302 1383302 0 0.0
.bss 89537 89537 0 0.0
.data 9816 9816 0 0.0
.text 1064952 1064952 0 0.0
bl602+rpc (read/write) 1428506 1428506 0 0.0
.bss 96969 96969 0 0.0
.data 10200 10200 0 0.0
.text 1096298 1096298 0 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188179 1188179 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67078 67078 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1506715 1506715 0 0.0
.debug_aranges 133088 133088 0 0.0
.debug_frame 486412 486412 0 0.0
.debug_info 37896039 37896041 2 0.0
.debug_line 5252141 5252141 0 0.0
.debug_loc 3362527 3362527 0 0.0
.debug_ranges 359760 359760 0 0.0
.debug_str 3455801 3455801 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116488 116488 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 564895 564895 0 0.0
.symtab 171616 171616 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
956818 956822 4 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284107 1284107 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75126 75126 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644294 1644294 0 0.0
.debug_aranges 140592 140592 0 0.0
.debug_frame 511788 511788 0 0.0
.debug_info 41802659 41802659 0 0.0
.debug_line 5626680 5626680 0 0.0
.debug_loc 3555234 3555234 0 0.0
.debug_ranges 382216 382216 0 0.0
.debug_str 3851768 3851768 0 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 129896 129896 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624068 624068 0 0.0
.symtab 189424 189424 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030522 1030522 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676595 676595 0 0.0
(read/write) 174940 174940 0 0.0
.bss 81228 81228 0 0.0
.data 3380 3380 0 0.0
.rodata 89603 89603 0 0.0
.text 586680 586680 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 640843 640843 0 0.0
(read/write) 157996 157996 0 0.0
.bss 80500 80500 0 0.0
.data 3380 3380 0 0.0
.rodata 78739 78739 0 0.0
.text 561784 561784 0 0.0
lock-ftd LP_CC2652R7 (read only) 678127 678127 0 0.0
(read/write) 170576 170576 0 0.0
.bss 78484 78484 0 0.0
.data 3304 3304 0 0.0
.rodata 77287 77287 0 0.0
.text 600360 600360 0 0.0
lock-mtd LP_CC2652R7 (read only) 661947 661947 0 0.0
(read/write) 182444 182444 0 0.0
.bss 74172 74172 0 0.0
.data 3304 3304 0 0.0
.rodata 103123 103123 0 0.0
.text 558344 558344 0 0.0
pump-app LP_CC2652R7 (read only) 687283 687283 0 0.0
(read/write) 162124 162124 0 0.0
.bss 78420 78420 0 0.0
.data 3296 3296 0 0.0
.rodata 90507 90507 0 0.0
.text 596292 596292 0 0.0
pump-controller-app LP_CC2652R7 (read only) 671791 671791 0 0.0
(read/write) 177728 177728 0 0.0
.bss 78532 78532 0 0.0
.data 3292 3292 0 0.0
.rodata 86063 86063 0 0.0
.text 585248 585248 0 0.0
shell LP_CC2652R7 (read only) 667622 667622 0 0.0
(read/write) 186224 186224 0 0.0
.bss 83540 83540 0 0.0
.data 3376 3376 0 0.0
.rodata 86318 86318 0 0.0
.text 580988 580988 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587338 587338 0 0.0
.app_xip_area 463996 463996 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 594394 594394 0 0.0
.app_xip_area 465724 465724 0 0.0
.bss 71096 71096 0 0.0
.data 752 752 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 543338 543338 0 0.0
.app_xip_area 425020 425020 0 0.0
.bss 60784 60784 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1110520 1110520 0 0.0
.bss 136532 136532 0 0.0
.data 2072 2072 0 0.0
.text 971896 971896 0 0.0
BRD4161A+rpc (read/write) 973644 973644 0 0.0
.bss 151044 151044 0 0.0
.data 2252 2252 0 0.0
.text 820328 820328 0 0.0
BRD4161A+rs911x (read/write) 1003768 1003768 0 0.0
.bss 169368 169368 0 0.0
.data 2064 2064 0 0.0
.text 832316 832316 0 0.0
lock-app BRD4161A+wf200 (read/write) 1151308 1151308 0 0.0
.bss 152248 152248 0 0.0
.data 2072 2072 0 0.0
.text 996968 996968 0 0.0
window-app BRD4161A (read/write) 1102568 1102568 0 0.0
.bss 137980 137980 0 0.0
.data 2096 2096 0 0.0
.text 962472 962472 0 0.0
esp32 all-clusters-app c3devkit (read only) 1222930 1222926 -4 -0.0
(read/write) 1788038 1788038 0 0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257608 257608 0 0.0
.flash.text 1222930 1222926 -4 -0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1232991 1232991 0 0.0
(read/write) 563940 563940 0 0.0
.dram0.bss 82304 82304 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314672 314672 0 0.0
.flash.text 1227607 1227607 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 649900 649900 0 0.0
.bss 70712 70712 0 0.0
.data 2068 2068 0 0.0
.text 574392 574392 0 0.0
lock k32w0+release (read/write) 706856 706856 0 0.0
.bss 71160 71160 0 0.0
.data 2076 2076 0 0.0
.text 630892 630892 0 0.0
linux chip-tool-ipv6only arm64 (read only) 10360932 10360932 0 0.0
(read/write) 706273 706273 0 0.0
.bss 33953 33953 0 0.0
.data 2864 2864 0 0.0
.data.rel.ro 650560 650560 0 0.0
.dynamic 560 560 0 0.0
.got 13912 13912 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 505924 505924 0 0.0
.text 8201012 8201012 0 0.0
thermostat-no-ble arm64 (read only) 2387420 2387420 0 0.0
(read/write) 143649 143649 0 0.0
.bss 55361 55361 0 0.0
.data 1912 1912 0 0.0
.data.rel.ro 77208 77208 0 0.0
.dynamic 560 560 0 0.0
.got 5192 5192 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 143636 143636 0 0.0
.text 2001472 2001472 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2455640 2455640 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1418284 1418284 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182835 1182835 0 0.0
bss 144433 144433 0 0.0
rodata 144196 144196 0 0.0
text 815292 815292 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1161487 1161487 0 0.0
bss 143660 143660 0 0.0
rodata 135768 135768 0 0.0
text 803160 803160 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1743900 1743900 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188712 188712 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1229301 1229301 0 0.0
.debug_aranges 111800 111800 0 0.0
.debug_frame 373268 373268 0 0.0
.debug_info 26817149 26817150 1 0.0
.debug_line 3667914 3667914 0 0.0
.debug_loc 3580270 3580270 0 0.0
.debug_ranges 339928 339928 0 0.0
.debug_str 3439445 3439445 0 0.0
.heap 841968 841968 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 569356 569356 0 0.0
.symtab 421168 421168 0 0.0
.text 1544136 1544136 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1686508 1686508 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1221100 1221100 0 0.0
.debug_aranges 111272 111272 0 0.0
.debug_frame 376348 376348 0 0.0
.debug_info 26553932 26553932 0 0.0
.debug_line 3688630 3688630 0 0.0
.debug_loc 3567907 3567907 0 0.0
.debug_ranges 338544 338544 0 0.0
.debug_str 3428458 3428458 0 0.0
.heap 842704 842704 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 533445 533445 0 0.0
.symtab 407600 407600 0 0.0
.text 1487480 1487480 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850896 850896 0 0.0
(read/write) 1605060 1605060 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179992 179992 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1055156 1055156 0 0.0
.debug_aranges 103480 103480 0 0.0
.debug_frame 346676 346676 0 0.0
.debug_info 22018112 22018111 -1 -0.0
.debug_line 3258550 3258550 0 0.0
.debug_loc 3266014 3266014 0 0.0
.debug_ranges 303872 303872 0 0.0
.debug_str 3233990 3233990 0 0.0
.heap 850896 850896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 469822 469822 0 0.0
.symtab 376048 376048 0 0.0
.text 1414224 1414224 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845864 845864 0 0.0
(read/write) 1642684 1642684 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185008 185008 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1062575 1062575 0 0.0
.debug_aranges 104152 104152 0 0.0
.debug_frame 349500 349500 0 0.0
.debug_info 22397448 22397449 1 0.0
.debug_line 3267242 3267242 0 0.0
.debug_loc 3305842 3305842 0 0.0
.debug_ranges 307216 307216 0 0.0
.debug_str 3261445 3261445 0 0.0
.heap 845864 845864 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 476025 476025 0 0.0
.symtab 379232 379232 0 0.0
.text 1446816 1446816 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1146320 1146320 0 0.0
.bss 110544 110544 0 0.0
.data 1028 1028 0 0.0
.text 593416 593416 0 0.0
lock-app qpg6105+debug (read/write) 1116220 1116220 0 0.0
.bss 106376 106376 0 0.0
.data 1032 1032 0 0.0
.text 563320 563320 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 814460 814468 8 0.0
bss 72172 72172 0 0.0
noinit 43488 43488 0 0.0
text 574564 574568 4 0.0
lighting-app tlsr9518adk80d (read/write) 836416 836424 8 0.0
bss 73028 73028 0 0.0
noinit 43488 43488 0 0.0
text 592724 592728 4 0.0
ota-requestor-app tlsr9518adk80d (read/write) 844524 844524 0 0.0
bss 73936 73936 0 0.0
noinit 43488 43488 0 0.0
text 598966 598968 2 0.0

@andy31415 andy31415 merged commit 4ea64dd into project-chip:master Sep 21, 2022
tima-q added a commit to tima-q/connectedhomeip that referenced this pull request Sep 22, 2022
@tima-q
* Allow overrule of PID/VID/Version at build time (project-chip#22787)
7717b07 
Used for customer development and simple OTA test image creation
@tima-q tima-q mentioned this pull request Sep 22, 2022
Merged
andy31415 pushed a commit that referenced this pull request Sep 22, 2022
@tima-q
* Allow overrule of PID/VID/Version at build time (#22787) (#22819)
9c0c1d4 
Used for customer development and simple OTA test image creation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

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

@arkq arkq Awaiting requested review from arkq

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

@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

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@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

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

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

@hawk248 hawk248 Awaiting requested review from hawk248

@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

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

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@rgoliver rgoliver Awaiting requested review from rgoliver

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@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

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

Successfully merging this pull request may close these issues.

[QPG] Generation of applications with no 0xFFF1 VID/PID/version should not require manual tweaks
2 participants
@tima-q @andy31415