Skip to content

Nordic add app_start config system support for NRF52840 for bootloader #5691

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
Merged
merged 1 commit into from
Dec 28, 2017
Merged

Nordic add app_start config system support for NRF52840 for bootloader #5691

merged 1 commit into from
Dec 28, 2017

Conversation

dlfryar-zz
Copy link
Contributor

Description

Add GCC/ARM/IAR linker support for APP_START symbol in config system to support boo loaders

Status

READY

@dlfryar-zz
Copy link
Contributor Author

Connected to #5492 this PR only addresses the 52840

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 13, 2017

@ARMmbed/team-nordic please review

nvlsianpu
nvlsianpu suggested changes Dec 14, 2017
View reviewed changes
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/device/TOOLCHAIN_GCC_ARM/NRF52840.ld Outdated
#endif

#if !defined(MBED_APP_SIZE)
#define MBED_APP_SIZE 0xfffff
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the flash end address value, not the application size.

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/device/TOOLCHAIN_IAR/nRF52832.icf Outdated
/*-Memory Regions-*/
define symbol __ICFEDIT_region_ROM_start__ = 0x21000;
define symbol __ICFEDIT_region_ROM_start__ = MBED_APP_START;
define symbol __ICFEDIT_region_ROM_end__ = 0xfffff;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MBED_APP_START + MBED_APP_SIZE - 1

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/device/TOOLCHAIN_IAR/nRF52832.icf
if (!isdefinedsymbol(MBED_APP_START)) {
define symbol MBED_APP_START = 0x21000;
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+if (!isdefinedsymbol(MBED_APP_SIZE)) {

  • define symbol MBED_APP_SIZE = 0xDF000;
    +}

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52832.sct Outdated
#define MBED_APP_START 0x21000
#endif

LR_IROM1 MBED_APP_START 0xfffff {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0xfffff MBED_APP_SIZE

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sure you should folow this guide: https://docs.mbed.com/docs/mbed-os-handbook/en/latest/advanced/flash/

@dlfryar-zz
Copy link
Contributor Author

Renamed linker scripts from nrf52832 to nrf52840 and added APP_SIZE changes.

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 18, 2017

@nvlsianpu Please review latest changes

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 19, 2017

/morph build

@mbed-ci
Copy link

mbed-ci commented Dec 19, 2017

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Dec 19, 2017

Exporter Build : SUCCESS

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

@mbed-ci
Copy link

mbed-ci commented Dec 19, 2017

Test : SUCCESS

Build number : 552
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/5691/552

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 20, 2017

@dlfryar Can you rebase to propagate here travis fix, all CI will be restarted and should be green

@studavekar
Copy link
Contributor

/morph build

@mbed-ci
Copy link

mbed-ci commented Dec 21, 2017

Build : FAILURE

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

@studavekar
Copy link
Contributor

Previous failure was because of network license issue

        [DEBUG] Return: 1
        [DEBUG] Output: Error: C9555E: Failed to check out a license.
        [DEBUG] Output: Unable to connect to the license server. Check that ARMLMD_LICENSE_FILE is set correctly, and the license server is available.
        [DEBUG] Output: Information about this error is available at: http://ds.arm.com/support/lic56/m96|

Re-triggering build

/morph build

@mbed-ci
Copy link

mbed-ci commented Dec 21, 2017

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Dec 21, 2017

Exporter Build : SUCCESS

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

@mbed-ci
Copy link

mbed-ci commented Dec 21, 2017

Test : SUCCESS

Build number : 571
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/5691/571

@0xc0170 0xc0170 removed the needs: CI label Dec 22, 2017
@cmonr cmonr merged commit 10076bd into ARMmbed:master Dec 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@nvlsianpu nvlsianpu nvlsianpu approved these changes

Assignees
No one assigned
Labels
release-version: 5.7.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dlfryar-zz @0xc0170 @mbed-ci @studavekar @nvlsianpu @cmonr