Fix nrf51 export #2345
Merged
Fix nrf51 export #2345
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@c1728p9 Could you check this ? |
| @@ -10,5 +14,5 @@ SREC_CAT = srec_cat | |||
|
|
|||
| {% block additional_targets %} | |||
| merge: | |||
There was a problem hiding this comment.
At minimum this should depend on $(Project).hex . Sorry I missed this when I unified the gcc_arm exporter.
It should really be
$(PROJECT)-combined.hex: $(PROJECT).hexNow "all" depend on the project merged with the soft device, the goal merged has been renamed into the file it generate and now depend on the realization of $(PROJECT).hex
|
@theotherjimmy Many thanks for the review, I've applied your suggestions to the PR. |
|
I'll give it a go in a moment. |
|
Looks good. I tried |
artokin
pushed a commit
to artokin/mbed-os
that referenced
this pull request
May 11, 2020
…..9a21668 9a21668 Merge branch 'release_internal' into release_external 8e72b80 MAC CCA thr: Check if channel out of range (ARMmbed#2363) 146a0a3 Corrected trace on authenticator d04a96d Merge pull request ARMmbed#2361 from ARMmbed/sync_with_mbedos 2c2b915 Added empty function for ns time callback 76ac0de Remove NCS36510 target 0258ac3 Remove KW24D target 788f01b Netsocket/lwIP Stack: Remove support for ARM Compiler 5 2fbc7a1 Corrected invalid memory read on access revoke 941b9b4 Updates to stagger/latency (ARMmbed#2358) c2abaaa Corrected defects 1811194 Corrected warning trace, validations and ut stubs 69e2d19 Added NS filesystem and interface to application c5b6993 refactored packet ingress a05605e Unsecured packets will be acked by default automatically. 36dfb29 MAC: Implemented automatic CCA threshold (ARMmbed#2353) 0396b97 Revert EAPOL simplify failure handling and focus this problem later on. b2fe3d4 Ignoring authentication failure if security protocol already started 11de56d Added info API for Wi-SUN border router 87a4f69 Added EAPOL key storage to authenticator and unified GTK storage (ARMmbed#2345) ff1ca25 EAPOL failure simplify and EAPOL relay agent add trace when eapol temp pool is empty 6667b31 Update NA trace 34cdafe Temporary EAPOL neighbour entry Update and MAC MLME update d092f83 Iotthd 3995 (ARMmbed#2347) e2ea4e4 Disabled BR (TLS server) EC calculation queue 5759851 Changed the rate limiting function to calculate the values runtime 899e755 Make it possible to update tr51 table to larger dynamically 8436669 Added configuration for DHCP lifetime value da732bc When network name or PAN ID is changed authenticator updates MAC keys git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: 9a21668
artokin
pushed a commit
to artokin/mbed-os
that referenced
this pull request
Jun 8, 2020
…..b3fe574 b3fe574 Remove test files from the release b2bf24c Merge branch 'release_internal' into release_external 0ed25a7 Fix errors found from coverity scan (ARMmbed#2386) 7a138f7 Added IID for border router info structure 4021b0c LLC secure data duplicate check update and EAPOL relay duplicate fix b190a97 Remove Thread-protocol from README (ARMmbed#2383) ae8ae32 EAPOL relay agent rx filter from joiner side 0d4eb7a Removed dead code part fc644f5 RPL new parent accept update and NUD operation f5920e2 ETX API update and RPL ETX threshold callback update. 1fdee20 Wi-sun keep all candidates alive by NUD. bd746da Key storage settings are no longer cleared on delete bd388fc Changed EAPOL initial-Key retries from 2 to 4 on large NW a3d80a3 WS bootstrap: Default CCA threshold to -60dBm (ARMmbed#2377) 72b26a7 Created extra large network setup for Wi-SUN 38dd4a6 Corrected PTK and PMK lifetime handling 64f2a77 Cleared EAPOL temporary trace print's. 02ec23f Timed parent selection is now imim-imin*2 earlier there was just 5 seconds randomize. 3b2d906 Added check for network name and DODAG ID IID (EUI-64) (ARMmbed#2373) ee45f4b Updated initial key trickles 184425b Fixed parent target address set. 07ec237 Updated Discovery and RPL setup large & medium size network a94d8f2 RPL version num update 9e2ac1d Double default eapol entry size for test purpose. 6b8beef Clear all neighbors only on eapol next target check faa19e1 Corrected next address set 8a917fb Continue trickle on initial EAPOL-key TX failure cfdb193 Merge pull request ARMmbed#2368 from ARMmbed/sync_with_mbedos f7a15fa (via MbedOS) ws: added support for brazilian regulatory domain c397edb Changed large network initial-key trickle parameters 758f534 Added maximum frame counter storing interval b0ea148 Corrected key storage configuration setting be3c94e WS RPL paret soft filter update 8b1d537 Adjusted EAPOL limits and timers 9a21668 Merge branch 'release_internal' into release_external 8e72b80 MAC CCA thr: Check if channel out of range (ARMmbed#2363) 146a0a3 Corrected trace on authenticator d04a96d Merge pull request ARMmbed#2361 from ARMmbed/sync_with_mbedos 2c2b915 Added empty function for ns time callback 76ac0de Remove NCS36510 target 0258ac3 Remove KW24D target 788f01b Netsocket/lwIP Stack: Remove support for ARM Compiler 5 2fbc7a1 Corrected invalid memory read on access revoke 941b9b4 Updates to stagger/latency (ARMmbed#2358) c2abaaa Corrected defects 1811194 Corrected warning trace, validations and ut stubs 69e2d19 Added NS filesystem and interface to application c5b6993 refactored packet ingress a05605e Unsecured packets will be acked by default automatically. 36dfb29 MAC: Implemented automatic CCA threshold (ARMmbed#2353) 0396b97 Revert EAPOL simplify failure handling and focus this problem later on. b2fe3d4 Ignoring authentication failure if security protocol already started 11de56d Added info API for Wi-SUN border router 87a4f69 Added EAPOL key storage to authenticator and unified GTK storage (ARMmbed#2345) ff1ca25 EAPOL failure simplify and EAPOL relay agent add trace when eapol temp pool is empty 6667b31 Update NA trace 34cdafe Temporary EAPOL neighbour entry Update and MAC MLME update d092f83 Iotthd 3995 (ARMmbed#2347) e2ea4e4 Disabled BR (TLS server) EC calculation queue 5759851 Changed the rate limiting function to calculate the values runtime 899e755 Make it possible to update tr51 table to larger dynamically 8436669 Added configuration for DHCP lifetime value da732bc When network name or PAN ID is changed authenticator updates MAC keys git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: b3fe574
artokin
pushed a commit
to artokin/mbed-os
that referenced
this pull request
Jun 8, 2020
…..b3fe574 b3fe574 Remove test files from the release b2bf24c Merge branch 'release_internal' into release_external 0ed25a7 Fix errors found from coverity scan (ARMmbed#2386) 7a138f7 Added IID for border router info structure 4021b0c LLC secure data duplicate check update and EAPOL relay duplicate fix b190a97 Remove Thread-protocol from README (ARMmbed#2383) ae8ae32 EAPOL relay agent rx filter from joiner side 0d4eb7a Removed dead code part fc644f5 RPL new parent accept update and NUD operation f5920e2 ETX API update and RPL ETX threshold callback update. 1fdee20 Wi-sun keep all candidates alive by NUD. bd746da Key storage settings are no longer cleared on delete bd388fc Changed EAPOL initial-Key retries from 2 to 4 on large NW a3d80a3 WS bootstrap: Default CCA threshold to -60dBm (ARMmbed#2377) 72b26a7 Created extra large network setup for Wi-SUN 38dd4a6 Corrected PTK and PMK lifetime handling 64f2a77 Cleared EAPOL temporary trace print's. 02ec23f Timed parent selection is now imim-imin*2 earlier there was just 5 seconds randomize. 3b2d906 Added check for network name and DODAG ID IID (EUI-64) (ARMmbed#2373) ee45f4b Updated initial key trickles 184425b Fixed parent target address set. 07ec237 Updated Discovery and RPL setup large & medium size network a94d8f2 RPL version num update 9e2ac1d Double default eapol entry size for test purpose. 6b8beef Clear all neighbors only on eapol next target check faa19e1 Corrected next address set 8a917fb Continue trickle on initial EAPOL-key TX failure cfdb193 Merge pull request ARMmbed#2368 from ARMmbed/sync_with_mbedos f7a15fa (via MbedOS) ws: added support for brazilian regulatory domain c397edb Changed large network initial-key trickle parameters 758f534 Added maximum frame counter storing interval b0ea148 Corrected key storage configuration setting be3c94e WS RPL paret soft filter update 8b1d537 Adjusted EAPOL limits and timers 9a21668 Merge branch 'release_internal' into release_external 8e72b80 MAC CCA thr: Check if channel out of range (ARMmbed#2363) 146a0a3 Corrected trace on authenticator d04a96d Merge pull request ARMmbed#2361 from ARMmbed/sync_with_mbedos 2c2b915 Added empty function for ns time callback 76ac0de Remove NCS36510 target 0258ac3 Remove KW24D target 788f01b Netsocket/lwIP Stack: Remove support for ARM Compiler 5 2fbc7a1 Corrected invalid memory read on access revoke 941b9b4 Updates to stagger/latency (ARMmbed#2358) c2abaaa Corrected defects 1811194 Corrected warning trace, validations and ut stubs 69e2d19 Added NS filesystem and interface to application c5b6993 refactored packet ingress a05605e Unsecured packets will be acked by default automatically. 36dfb29 MAC: Implemented automatic CCA threshold (ARMmbed#2353) 0396b97 Revert EAPOL simplify failure handling and focus this problem later on. b2fe3d4 Ignoring authentication failure if security protocol already started 11de56d Added info API for Wi-SUN border router 87a4f69 Added EAPOL key storage to authenticator and unified GTK storage (ARMmbed#2345) ff1ca25 EAPOL failure simplify and EAPOL relay agent add trace when eapol temp pool is empty 6667b31 Update NA trace 34cdafe Temporary EAPOL neighbour entry Update and MAC MLME update d092f83 Iotthd 3995 (ARMmbed#2347) e2ea4e4 Disabled BR (TLS server) EC calculation queue 5759851 Changed the rate limiting function to calculate the values runtime 899e755 Make it possible to update tr51 table to larger dynamically 8436669 Added configuration for DHCP lifetime value da732bc When network name or PAN ID is changed authenticator updates MAC keys git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: b3fe574
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This should fix #2270 .