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

Update Toolchain Arm Micro scatter files #9766

Merged
merged 16 commits into from Mar 1, 2019

Conversation

Projects
None yet
9 participants
@deepikabhavnani
Copy link
Contributor

commented Feb 19, 2019

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

@deepikabhavnani

This comment has been minimized.

Copy link
Contributor Author

commented Feb 19, 2019

@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

This comment has been minimized.

Copy link
Contributor

commented Feb 19, 2019

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

@deepikabhavnani

This comment has been minimized.

Copy link
Contributor Author

commented Feb 19, 2019

Thanks @mikisch81

@deepikabhavnani deepikabhavnani force-pushed the deepikabhavnani:uarm_fixes branch Feb 19, 2019

@cmonr cmonr requested review from ARMmbed/team-silabs Feb 20, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Feb 20, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Feb 20, 2019

CI started whilst waiting on additional reviews

@mbed-ci

This comment has been minimized.

Copy link

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
@cmonr

This comment has been minimized.

Copy link
Contributor

commented Feb 20, 2019

CI restarted for testing purposes.

@mbed-ci

This comment has been minimized.

Copy link

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

@cmonr cmonr added needs: work and removed needs: review labels Feb 21, 2019

Show resolved Hide resolved ...ets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/NANO130.sct Outdated
Show resolved Hide resolved ...ets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/NANO130.sct Outdated
Show resolved Hide resolved ...ets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/NANO130.sct Outdated
Show resolved Hide resolved ...ets/TARGET_NUVOTON/TARGET_NANO100/device/TOOLCHAIN_ARM_MICRO/NANO130.sct Outdated
@ccli8

ccli8 approved these changes Feb 22, 2019

Copy link
Contributor

left a comment

Changes are OK.

Show resolved Hide resolved ...reescale/TARGET_KLXX/TARGET_KL05Z/device/TOOLCHAIN_ARM_MICRO/MKL05Z4.sct Outdated
EXPORT __initial_sp
EXPORT __heap_base
EXPORT __heap_limit

END

This comment has been minimized.

Copy link
@mmahadevan108

mmahadevan108 Feb 22, 2019

Contributor

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

@deepikabhavnani deepikabhavnani force-pushed the deepikabhavnani:uarm_fixes branch Feb 22, 2019

Show resolved Hide resolved targets/TARGET_NXP/TARGET_LPC13XX/device/TOOLCHAIN_ARM_MICRO/LPC1347.sct Outdated
Show resolved Hide resolved targets/TARGET_NXP/TARGET_LPC13XX/device/TOOLCHAIN_ARM_MICRO/LPC1347.sct Outdated

deepikabhavnani added some commits Feb 19, 2019

Target_NXP: Add ARM_LIB_STACK and ARM_LIB_HEAP section
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
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
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
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
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

@deepikabhavnani deepikabhavnani force-pushed the deepikabhavnani:uarm_fixes branch to 1225499 Mar 1, 2019

@deepikabhavnani

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

Rebase done

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2019

CI started since @deepikabhavnani is fast

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 1, 2019

Test run: SUCCESS

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

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 1, 2019

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

@cmonr cmonr added ready for merge and removed needs: review labels Mar 1, 2019

@0xc0170

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

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

@0xc0170

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

All issues should be resolved.

@0xc0170 0xc0170 merged commit f559d03 into ARMmbed:master Mar 1, 2019

28 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARMC5 Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR8 Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARMC5 Success
Details
jenkins-ci/mbed2-build-ARMC6 Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR8 Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 9143 cycles (+50 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details

@0xc0170 0xc0170 removed the ready for merge label Mar 1, 2019

@deepikabhavnani deepikabhavnani deleted the deepikabhavnani:uarm_fixes branch Mar 1, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.