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 CMSIS/RTX with Cortex-A support #5342

Merged
merged 26 commits into from Nov 15, 2017

Conversation

@bulislaw
Member

bulislaw commented Oct 18, 2017

Description

This PR introduces updates to RTX/CMSIS and brings Cortex-A support back into mbed OS

I've closed #5312 by mistake and can't seem to open it again.

Status

IN DEVELOPMENT

ToDo

  • Validation
  • uVisor sanity check
  • v8 sanity check
  • IAR support for Cortex-A

CC
@Patater could you have a look at my merges of your old uVisor commits

@bulislaw bulislaw self-assigned this Oct 18, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 18, 2017

/morph build

1 similar comment
@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 18, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 18, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Oct 19, 2017

@bulislaw
How is the status of reflection that I mentioned in #5312 going ?

cc @toyowata

@toyowata

This comment has been minimized.

Contributor

toyowata commented Oct 19, 2017

@TomoYamanaka

How is the status of reflection that I mentioned in #5312 going ?

I think you can make your PR which include these changes, once this PR #5342 will be merged.
Can you share with your test result in your local environment?

@bulislaw bulislaw force-pushed the feature_cortex_a branch from f16c01e to 970a488 Oct 19, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 19, 2017

/morph build

1 similar comment
@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 19, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 19, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 19, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 19, 2017

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 19, 2017

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 19, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 20, 2017

/morph build

1 similar comment
@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 20, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 20, 2017

@bulislaw bulislaw force-pushed the feature_cortex_a branch to 10f565c Oct 20, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 20, 2017

/morph build

1 similar comment
@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 20, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Oct 20, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 20, 2017

@Archcady could you please fix Ameba board for this PR, it seems there's some stuff compiled in your binaries that not compatible with updated CMSIS/RTX. You can submit a PR against feature_cortex_a branch.

        [Error] cmsis_iar.h@111,27: [Pe147]: declaration is incompatible with "__nounwind __interwork __softfp unsigned long __get_PSR(void)" (declared at line 54 of "/usr/local/iccarm-7.80.1/bin/../inc/c/intrinsics.h")
        [Error] cmsis_iar.h@211,26: [Pe247]: function "__RRX" has already been defined (at line 513 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@218,27: [Pe247]: function "__LDRBT" has already been defined (at line 660 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@225,27: [Pe247]: function "__LDRHT" has already been defined (at line 666 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@232,23: [Pe247]: function "__LDRT" has already been defined (at line 672 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@239,23: [Pe247]: function "__STRBT" has already been defined (at line 678 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@244,23: [Pe247]: function "__STRHT" has already been defined (at line 682 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@249,27: [Pe247]: function "__STRT" has already been defined (at line 686 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")
        [Error] cmsis_iar.h@258,6: [Pe247]: function "__ROR" has already been defined (at line 530 of "/builds/ws/mbed-os-build-matrix/7376d91e/mbed-os/cmsis/TARGET_CORTEX_M/cmsis_iccarm.h")

http://mbed-os.s3-eu-west-1.amazonaws.com/builds/5342/FAIL/REALTEK_RTL8195AM/IAR/10f565ca4ba33d7a7391d7c657ad2aae2e6d5674_build_log_REALTEK_RTL8195AM_IAR.txt

@bulislaw

This comment has been minimized.

Member

bulislaw commented Oct 24, 2017

@tung7970

This comment has been minimized.

Contributor

tung7970 commented Oct 24, 2017

@bulislaw Please try PR #5371. Those header files look redundant to me. Can simply remove it. Tested it with GCC, and should be OK with IAR or ARMCC. (dont have access to any of those since I am off-site right now)

@bulislaw bulislaw removed the needs: work label Nov 10, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Nov 10, 2017

Good catch! It was a rebase mistake...

@bulislaw

This comment has been minimized.

Member

bulislaw commented Nov 13, 2017

Ok how do we get that merged? The CIs keep spinning and restarting...

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 13, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Nov 13, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 13, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Nov 13, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 13, 2017

Failures in the CI, not related to this patch I believe, we are investigating

cc @studavekar

@mbed-ci

This comment has been minimized.

mbed-ci commented Nov 13, 2017

Build : SUCCESS

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

Triggering tests

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

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Nov 14, 2017

@0xc0170 uVisor is stuck could you poke it?

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 14, 2017

Build scheduled manually

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Nov 14, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Nov 15, 2017

Can we merge it before the CIs restart themselves yet again please.

@0xc0170 0xc0170 merged commit 41eb565 into master Nov 15, 2017

7 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@0xc0170

This comment has been minimized.

Member

0xc0170 commented Nov 15, 2017

Please remove the branch feature_cortex_a if not used anymore . We labeled it for 5.7rc1

@sg- sg- deleted the feature_cortex_a branch Nov 27, 2017

@sg- sg- restored the feature_cortex_a branch Nov 27, 2017

@deepikabhavnani deepikabhavnani deleted the feature_cortex_a branch Nov 29, 2017

@deepikabhavnani deepikabhavnani restored the feature_cortex_a branch Nov 29, 2017

@bulislaw bulislaw deleted the feature_cortex_a branch Jun 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment