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.

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

Fix vector table relocation for NRF52 #6746

Merged
merged 1 commit into from
Apr 30, 2018
Merged

Fix vector table relocation for NRF52 #6746

merged 1 commit into from
Apr 30, 2018

Conversation

marcuschangarm
Copy link
Contributor

@marcuschangarm marcuschangarm commented Apr 25, 2018

Description

The vector table relocation sequence depends on:

  1. Whether the SoftDevice is present.
  2. The Application is a bootloader or not.

If the SoftDevice is present and the application is a bootloader
the MBR must be initialized to trap SoftDevice service calls
before setting the new vector table address.

The SCB->VTOR must be set to point at the MBR as well.

If the SoftDevice is not present the SCB->VTOR can point at the
new vector table directly.

Pull request type

[x] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@marcuschangarm
Copy link
Contributor Author

@c1728p9

As we discussed. The MBR does not trap SoftDevice service calls if the UICR bootloader address is set hence the extra check.

0xc0170
0xc0170 previously approved these changes Apr 26, 2018
@0xc0170
Copy link
Contributor

0xc0170 commented Apr 26, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 26, 2018

Build : SUCCESS

Build number : 1863
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6746/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Apr 26, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 26, 2018

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 27, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

Build : SUCCESS

Build number : 1869
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6746/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 27, 2018

We should wait for nrf52 flash fix and restart CI right away then

The vector table relocation sequence depends on:

1. Whether the SoftDevice is present.
2. The Application is a bootloader or not.

If the SoftDevice is present and the application is a bootloader
the MBR must be initialized to trap SoftDevice service calls
before setting the new vector table address.

The SCB->VTOR must be set to point at the MBR as well.

If the SoftDevice is not present the SCB->VTOR can point at the
new vector table directly.
@marcuschangarm
Copy link
Contributor Author

/morph build

1 similar comment
@cmonr
Copy link
Contributor

cmonr commented Apr 27, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

Build : SUCCESS

Build number : 1877
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6746/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@marcuschangarm
Copy link
Contributor Author

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

Build : SUCCESS

Build number : 1879
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6746/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Apr 27, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 28, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 28, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 28, 2018

@marcuschangarm
Copy link
Contributor Author

/morph test

@mbed-ci
Copy link

mbed-ci commented Apr 28, 2018

@adbridge
Copy link
Contributor

@c1728p9 Could you please review this PR asap. Thanks

@theotherjimmy theotherjimmy merged commit d08c819 into ARMmbed:master Apr 30, 2018
@theotherjimmy
Copy link
Contributor

Depends on prior NRF52 stuff, going to 5.9.0-rc1

@marcuschangarm marcuschangarm deleted the fix-vector-relocation branch May 10, 2018 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants