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

Fix NRF flashbundle #15262

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Fix NRF flashbundle #15262

merged 1 commit into from
Feb 21, 2022

Conversation

rgoliver
Copy link

Problem

The flashbundle being built for NRF doesn't boot.

Change overview

  • Use the merged.hex not zephyr.hex image for the flashbundle.

Testing

Built and flashed lighting app using scripts and verified it booted.

@boring-cyborg boring-cyborg bot added the config label Feb 16, 2022
@github-actions
Copy link

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

PR #15262: Size comparison from cefe25d to 31160ff

Full report (21 builds for cyw30739, esp32, k32w, linux, mbed, p6, qpg, telink)
platform target config section cefe25d 31160ff1 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 597258 597258 0 0.0
.app_xip_area 501176 501176 0 0.0
.bss 78780 78780 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) 555202 555202 0 0.0
.app_xip_area 460688 460688 0 0.0
.bss 77252 77252 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) 576310 576310 0 0.0
.app_xip_area 472364 472364 0 0.0
.bss 86356 86356 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
esp32 all-clusters-app c3devkit (read only) 947604 947604 0 0.0
(read/write) 1401130 1401130 0 0.0
.dram0.bss 68296 68296 0 0.0
.dram0.data 14268 14268 0 0.0
.flash.rodata 199664 199664 0 0.0
.flash.text 947604 947604 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 997331 997331 0 0.0
(read/write) 466380 466380 0 0.0
.dram0.bss 73432 73432 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 226756 226756 0 0.0
.flash.text 991947 991947 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 691232 691232 0 0.0
.bss 78384 78384 0 0.0
.data 1912 1912 0 0.0
.text 605136 605136 0 0.0
lock k32w061+release (read/write) 693848 693848 0 0.0
.bss 78600 78600 0 0.0
.data 1952 1952 0 0.0
.text 607496 607496 0 0.0
linux chip-tool-ipv6only arm64 (read only) 8332196 8332196 0 0.0
(read/write) 362609 362609 0 0.0
.bss 58961 58961 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 249368 249368 0 0.0
.dynamic 560 560 0 0.0
.got 49272 49272 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 435756 435756 0 0.0
.text 7133748 7133748 0 0.0
thermostat-no-ble arm64 (read only) 2162044 2162044 0 0.0
(read/write) 150737 150737 0 0.0
.bss 67489 67489 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75024 75024 0 0.0
.dynamic 560 560 0 0.0
.got 4208 4208 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 133532 133532 0 0.0
.text 1809888 1809888 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2428412 2428412 0 0.0
.bss 195916 195916 0 0.0
.data 5328 5328 0 0.0
.text 1390984 1390984 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2391612 2391612 0 0.0
.bss 188448 188448 0 0.0
.data 5632 5632 0 0.0
.text 1354184 1354184 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2327056 2327056 0 0.0
.bss 187424 187424 0 0.0
.data 5608 5608 0 0.0
.text 1289656 1289656 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139840 1139840 0 0.0
.bss 11796 11796 0 0.0
.data 4368 4368 0 0.0
.text 103224 103224 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2317820 2317820 0 0.0
.bss 185972 185972 0 0.0
.data 5440 5440 0 0.0
.text 1280392 1280392 0 0.0
p6 all-clusters-app default (read/write) 2485872 2485872 0 0.0
.bss 124232 124232 0 0.0
.data 2672 2672 0 0.0
.text 1444136 1444136 0 0.0
light-app default (read/write) 2392760 2392760 0 0.0
.bss 113912 113912 0 0.0
.data 2528 2528 0 0.0
.text 1351024 1351024 0 0.0
lock-app default (read/write) 2356240 2356240 0 0.0
.bss 113640 113640 0 0.0
.data 2488 2488 0 0.0
.text 1314504 1314504 0 0.0
qpg lighting-app qpg6105+debug (read only) 598744 598744 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90744 90744 0 0.0
.data 1112 1112 0 0.0
.text 593424 593424 0 0.0
lock-app qpg6105+debug (read only) 564352 564352 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90728 90728 0 0.0
.data 1064 1064 0 0.0
.text 559032 559032 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) 877490 877490 0 0.0
bss 87520 87520 0 0.0
noinit 37160 37160 0 0.0
text 617978 617978 0 0.0

Fix NRF flashbundle
d1cfeb5 
The flashbundle is using the zephyr.hex which doesn't boot if a bootloader
is DFU  is enabled, instead use merged.hex when it is generated.
@github-actions
Copy link

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

PR #15262: Size comparison from 3f300dd to d1cfeb5

Full report (41 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 3f300dd d1cfeb5 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 598498 598498 0 0.0
.app_xip_area 502440 502440 0 0.0
.bss 78756 78756 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) 556646 556646 0 0.0
.app_xip_area 462132 462132 0 0.0
.bss 77252 77252 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) 577770 577770 0 0.0
.app_xip_area 473824 473824 0 0.0
.bss 86356 86356 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) 914536 914536 0 0.0
(read/write) 129504 129504 0 0.0
.bss 127464 127464 0 0.0
.data 2036 2036 0 0.0
.text 914528 914528 0 0.0
BRD4161A+rpc (read only) 943228 943228 0 0.0
(read/write) 146416 146416 0 0.0
.bss 144240 144240 0 0.0
.data 2176 2176 0 0.0
.text 943220 943220 0 0.0
window-app BRD4161A (read only) 848516 848516 0 0.0
(read/write) 127416 127416 0 0.0
.bss 125512 125512 0 0.0
.data 1904 1904 0 0.0
.text 848508 848508 0 0.0
esp32 all-clusters-app c3devkit (read only) 949808 949808 0 0.0
(read/write) 1401602 1401602 0 0.0
.dram0.bss 68504 68504 0 0.0
.dram0.data 14156 14156 0 0.0
.flash.rodata 200040 200040 0 0.0
.flash.text 949808 949808 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 999271 999271 0 0.0
(read/write) 466832 466832 0 0.0
.dram0.bss 73640 73640 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 227000 227000 0 0.0
.flash.text 993887 993887 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 691784 691784 0 0.0
.bss 78384 78384 0 0.0
.data 1912 1912 0 0.0
.text 605688 605688 0 0.0
lock k32w061+release (read/write) 694384 694384 0 0.0
.bss 78600 78600 0 0.0
.data 1952 1952 0 0.0
.text 608032 608032 0 0.0
linux all-clusters-app debug (read only) 2381585 2381585 0 0.0
(read/write) 151104 151104 0 0.0
.bss 65376 65376 0 0.0
.data 1328 1328 0 0.0
.data.rel.ro 78696 78696 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 206309 206309 0 0.0
.text 2012290 2012290 0 0.0
bridge-app debug+rpc (read only) 1731293 1731293 0 0.0
(read/write) 94568 94568 0 0.0
.bss 49296 49296 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38104 38104 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 142188 142188 0 0.0
.text 1472725 1472725 0 0.0
chip-tool debug (read only) 8625813 8625813 0 0.0
(read/write) 256576 256576 0 0.0
.bss 40712 40712 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 208656 208656 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 462485 462485 0 0.0
.text 7643077 7643077 0 0.0
door-lock-app debug (read only) 1943041 1943041 0 0.0
(read/write) 120536 120536 0 0.0
.bss 51984 51984 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62104 62104 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 173522 173522 0 0.0
.text 1620610 1620610 0 0.0
lighting-app debug+rpc (read only) 2069065 2069065 0 0.0
(read/write) 125528 125528 0 0.0
.bss 52992 52992 0 0.0
.data 1400 1400 0 0.0
.data.rel.ro 65616 65616 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 166097 166097 0 0.0
.text 1747922 1747922 0 0.0
ota-provider-app debug (read only) 1876497 1876497 0 0.0
(read/write) 116216 116216 0 0.0
.bss 51840 51840 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57496 57496 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 158395 158395 0 0.0
.text 1567090 1567090 0 0.0
ota-requestor-app debug (read only) 1889809 1889809 0 0.0
(read/write) 117632 117632 0 0.0
.bss 52256 52256 0 0.0
.data 1160 1160 0 0.0
.data.rel.ro 58760 58760 0 0.0
.dynamic 592 592 0 0.0
.got 4200 4200 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 153228 153228 0 0.0
.text 1587074 1587074 0 0.0
shell debug (read only) 2356425 2356425 0 0.0
(read/write) 153456 153456 0 0.0
.bss 73696 73696 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73240 73240 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 207378 207378 0 0.0
.text 1992194 1992194 0 0.0
tv-app debug (read only) 2538449 2538449 0 0.0
(read/write) 151456 151456 0 0.0
.bss 69184 69184 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73016 73016 0 0.0
.dynamic 592 592 0 0.0
.got 4552 4552 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 198349 198349 0 0.0
.text 2166738 2166738 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2430164 2430164 0 0.0
.bss 195916 195916 0 0.0
.data 5328 5328 0 0.0
.text 1392736 1392736 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2391940 2391940 0 0.0
.bss 188424 188424 0 0.0
.data 5632 5632 0 0.0
.text 1354512 1354512 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2327568 2327568 0 0.0
.bss 187424 187424 0 0.0
.data 5608 5608 0 0.0
.text 1290168 1290168 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139840 1139840 0 0.0
.bss 11796 11796 0 0.0
.data 4368 4368 0 0.0
.text 103224 103224 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2318404 2318404 0 0.0
.bss 185972 185972 0 0.0
.data 5440 5440 0 0.0
.text 1280976 1280976 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1022527 1022527 0 0.0
bss 123524 123524 0 0.0
rodata 120636 120636 0 0.0
text 699348 699348 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 991835 991835 0 0.0
bss 120712 120712 0 0.0
rodata 112176 112176 0 0.0
text 679248 679248 0 0.0
nrf52840dongle_nrf52840 (read/write) 1037343 1037343 0 0.0
bss 124744 124744 0 0.0
rodata 119464 119464 0 0.0
text 703216 703216 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 929138 929138 0 0.0
bss 120084 120084 0 0.0
rodata 113892 113892 0 0.0
text 614372 614372 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 951403 951403 0 0.0
bss 121752 121752 0 0.0
rodata 109472 109472 0 0.0
text 641568 641568 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 858878 858878 0 0.0
bss 118344 118344 0 0.0
rodata 102640 102640 0 0.0
text 557372 557372 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) 949851 949851 0 0.0
bss 121472 121472 0 0.0
rodata 108424 108424 0 0.0
text 641388 641388 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 945923 945923 0 0.0
bss 121476 121476 0 0.0
rodata 108120 108120 0 0.0
text 637628 637628 0 0.0
shell nrf52840dk_nrf52840 (read/write) 810767 810767 0 0.0
bss 113324 113324 0 0.0
rodata 79348 79348 0 0.0
text 540444 540444 0 0.0
p6 all-clusters-app default (read/write) 2487800 2487800 0 0.0
.bss 124232 124232 0 0.0
.data 2672 2672 0 0.0
.text 1446064 1446064 0 0.0
light-app default (read/write) 2393096 2393096 0 0.0
.bss 113888 113888 0 0.0
.data 2528 2528 0 0.0
.text 1351360 1351360 0 0.0
lock-app default (read/write) 2356744 2356744 0 0.0
.bss 113640 113640 0 0.0
.data 2488 2488 0 0.0
.text 1315008 1315008 0 0.0
qpg lighting-app qpg6105+debug (read only) 600028 600028 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90720 90720 0 0.0
.data 1112 1112 0 0.0
.text 594708 594708 0 0.0
lock-app qpg6105+debug (read only) 565824 565824 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90728 90728 0 0.0
.data 1064 1064 0 0.0
.text 560504 560504 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) 877894 877894 0 0.0
bss 87496 87496 0 0.0
noinit 37160 37160 0 0.0
text 618338 618338 0 0.0

@woody-apple woody-apple merged commit ee63dc2 into project-chip:master Feb 21, 2022
rgoliver pushed a commit to rgoliver/connectedhomeip that referenced this pull request Mar 3, 2022
Fix NRF flashbundle (project-chip#15262)
d46881e 
The flashbundle is using the zephyr.hex which doesn't boot if a bootloader
is DFU  is enabled, instead use merged.hex when it is generated.
andy31415 pushed a commit that referenced this pull request Mar 3, 2022
Fix NRF flashbundle (#15262) (#15806)
a2f1b36 
The flashbundle is using the zephyr.hex which doesn't boot if a bootloader
is DFU  is enabled, instead use merged.hex when it is generated.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mspang mspang mspang approved these changes

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

@Damian-Nordic Damian-Nordic Damian-Nordic 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

@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

@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

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

@kghost kghost Awaiting requested review from kghost

@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

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@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

@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

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

Successfully merging this pull request may close these issues.
5 participants
@rgoliver @mspang @bzbarsky-apple @Damian-Nordic @woody-apple