Fix bug in MBR for NRF52 series #6798
Merged
Conversation
This file contains hidden or 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
The MBR VTOR state depends on how the application is booted. This makes it difficult to initialize the MBR correctly since a bug prevents the MBR from being initialized more than once. This commit resets the MBR and SoftDevice to a known state before initializing the MBR and setting the VTOR through the SoftDevice.
|
@c1728p9 this should be a more robust way of booting the device. |
0xc0170
approved these changes
May 3, 2018
c1728p9
approved these changes
May 3, 2018
| #define UICR_BOOTLOADER_ADDRESS 0x10001014 | ||
| #define MBR_ADDRESS 0x0 | ||
| #define MBR_VTOR_ADDRESS 0x20000000 | ||
| #define SOFTDEVICE_VTOR_ADDRESS 0x20000004 |
There was a problem hiding this comment.
Is MBR_VTOR_ADDRESS the vector table itself or a pointer to the vector table address?
|
|
||
| /* Reset SoftDevive VTOR. */ | ||
| uint32_t *softdevice_vtor_address = (uint32_t *) SOFTDEVICE_VTOR_ADDRESS; | ||
| *softdevice_vtor_address = 0xFFFFFFFF; |
There was a problem hiding this comment.
Why 0xFFFFFFFF? Does this have a special meaning to the softdevice?
|
/morph build |
Build : SUCCESSBuild number : 1912 Triggering tests/morph test |
Exporter Build : SUCCESSBuild number : 1558 |
Test : SUCCESSBuild number : 1729 |
0xc0170
added
release-version: 5.9.0-rc1
and removed
ready for merge
release-version: 5.8.5
labels
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.
Description
The MBR VTOR state depends on how the application is booted. This makes it difficult to initialize the MBR correctly since a bug prevents the MBR from being initialized more than once.
This commit resets the MBR and SoftDevice to a known state before initializing the MBR and setting the VTOR through the SoftDevice.
Pull request type