Skip to content

Update Toolchain Arm Micro scatter files #9766

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 16 commits into from
Mar 1, 2019
Merged

Update Toolchain Arm Micro scatter files #9766

merged 16 commits into from
Mar 1, 2019

Conversation

deepikabhavnani
Copy link

Description

As part of 2-region memory model support for all toolchains (#9571) linker files for ARM MICRO were updated to have fixed size stack.

Microlib only supports the two region memory model, updated arm_std.c and linker scripts to use ARM_LIB_STACK and ARM_LIB_HEAP section from scatter files, instead of user defined symbols

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@SenRamakri

@ARMmbed/mbed-os-maintainers - This PR Is not dependent on any PR, but is part of feature for 5.12

@cmonr cmonr requested a review from SenRamakri February 19, 2019 21:20
@deepikabhavnani
Copy link
Author

@ARMmbed/mbed-os-maintainers @mikisch81 -

Failure in travis-ci/psa-autogen seems related to https://github.com/ARMmbed/mbed-os/pull/9653/files#diff-9e240d13118c72755ed755c1934fbf6a

$ python tools/spm/generate_partition_code.py
python: can't open file 'tools/spm/generate_partition_code.py': [Errno 2] No such file or directory
The command "python tools/spm/generate_partition_code.py" exited with 2.

tools/spm/generate_partition_code.py was moved to tools/psa/mbed_spm_tfm_common.py

@mikisch81
Copy link
Contributor

@deepikabhavnani you need to rebase, Travis file was also updated in #9653

@deepikabhavnani
Copy link
Author

Thanks @mikisch81

@cmonr cmonr requested review from a team February 20, 2019 16:48
@cmonr
Copy link
Contributor

cmonr commented Feb 20, 2019

@Team-SiLabs @ARMmbed/team-nuvoton @ARMmbed/team-nxp @ARMmbed/team-st-mcd @ARMmbed/team-maximintegrated @SenRamakri Please review./

deepikabhavnani pushed a commit to deepikabhavnani/mbed-os that referenced this pull request Feb 20, 2019
Update NS linker files as per Mbed_OS 2-region memory model

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
1d9c4ac 
More information:
https://github.com/ARMmbed/mbed-os/pull/9571/files#diff-bf68ab6705d031e5c30bcd6fbe957cd4
ARMmbed#9571
ARMmbed#9766
@deepikabhavnani deepikabhavnani mentioned this pull request Feb 20, 2019
Merged
@cmonr
Copy link
Contributor

cmonr commented Feb 20, 2019

CI started whilst waiting on additional reviews

@mbed-ci
Copy link

mbed-ci commented Feb 20, 2019

Test run: FAILED

Summary: 1 of 8 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_mbed2-build-ARM

@deepikabhavnani deepikabhavnani mentioned this pull request Feb 20, 2019
Merged
@cmonr
Copy link
Contributor

cmonr commented Feb 20, 2019

CI restarted for testing purposes.

@mbed-ci
Copy link

mbed-ci commented Feb 21, 2019

Test run: FAILED

Summary: 1 of 8 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_mbed2-build-ARM

ccli8
ccli8 approved these changes Feb 22, 2019
View reviewed changes
Copy link
Contributor

@ccli8 ccli8 left a comment

Choose a reason for hiding this comment

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

Changes are OK.

mmahadevan108
mmahadevan108 reviewed Feb 22, 2019
View reviewed changes
targets/TARGET_NXP/TARGET_LPC11U6X/device/TOOLCHAIN_ARM_STD/TARGET_LPC11U68/startup_LPC11U6x.S
EXPORT __initial_sp
EXPORT __heap_base
EXPORT __heap_limit

END
Copy link
Contributor

@mmahadevan108 mmahadevan108 Feb 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Should this be part of a different PR? This seems to be for ARM_STD

deepikabhavnani added 14 commits February 28, 2019 19:54
Target_STM: Add ARM_LIB_STACK and ARM_LIB_HEAP section
b598dc1 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_SiLabs: Add ARM_LIB_STACK and ARM_LIB_HEAP section
6b98bc2 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_NXP: Add ARM_LIB_STACK and ARM_LIB_HEAP section
c91d35c 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_NUVOTON: Add ARM_LIB_STACK and ARM_LIB_HEAP section
2a19250 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_GigaDevice: Add ARM_LIB_STACK and ARM_LIB_HEAP section
e731a15 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_Freescale: Add ARM_LIB_STACK and ARM_LIB_HEAP section
4b95b51 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Target_Atmel: Add ARM_LIB_STACK and ARM_LIB_HEAP section
adae2e9 
Instead of user defined symbols in assembly files or C files,
use linker scripts to add heap and stack - this is inconsistent
with ARM std linker scripts
Guard RAM start and size defines
0dc5561
Heap and stack size picked from linker files,export symbols not needed
0ff2d42
Addressed review comments to correct size values
7504053
Add missing SHEBANG = #! armcc -E
944483b
Update retarget file for microlib
1182d64
Update linker scripts for LPC824 and Wiznet
6ab48b1
Add Crash report section to all uARM files
1225499
@deepikabhavnani
Copy link
Author

Rebase done

@cmonr
Copy link
Contributor

cmonr commented Mar 1, 2019

CI started since @deepikabhavnani is fast

@mbed-ci
Copy link

mbed-ci commented Mar 1, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 4
Build artifacts

@cmonr
Copy link
Contributor

cmonr commented Mar 1, 2019

Once master is fised (note: travis-ci/psa-autogen is not green on master`, this should be good to go!

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 1, 2019

@jeromecoutant Is this good to go? All issues resolved?

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 1, 2019

All issues should be resolved.

@0xc0170 0xc0170 merged commit f559d03 into ARMmbed:master Mar 1, 2019
@deepikabhavnani deepikabhavnani deleted the uarm_fixes branch March 1, 2019 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeromecoutant jeromecoutant

@bulislaw bulislaw

@0xc0170 0xc0170

@ccli8 ccli8

@mmahadevan108 mmahadevan108

@SenRamakri SenRamakri

Assignees
No one assigned
Labels
release-version: 5.12.0-rc1 risk: A
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@deepikabhavnani @mikisch81 @cmonr @mbed-ci @0xc0170 @jeromecoutant @bulislaw @ccli8 @mmahadevan108