Skip to content

Modify itm_api.c for EFM32 targets #12043

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 2 commits into from
Dec 10, 2019
Merged

Modify itm_api.c for EFM32 targets #12043

merged 2 commits into from
Dec 10, 2019

Conversation

petroborys
Copy link
Contributor

Description

Modify itm_api.c for EFM32 targets to be possible to change SWO location in device_peripherals.h

Pull request type

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

Release Notes

Tested on the EFM32GG11_STK3701

@ciarmcom ciarmcom requested review from a team December 6, 2019 14:00
@ciarmcom
Copy link
Member

ciarmcom commented Dec 6, 2019

@petroborys, thank you for your changes.
@ARMmbed/mbed-os-core @ARMmbed/mbed-os-wan @ARMmbed/mbed-os-pan @ARMmbed/mbed-os-test @ARMmbed/mbed-os-ipcore @ARMmbed/mbed-os-maintainers @ARMmbed/mbed-os-hal @ARMmbed/mbed-os-crypto @ARMmbed/mbed-os-tls please review.

@0xc0170 0xc0170 removed request for a team December 6, 2019 14:44
0xc0170
0xc0170 requested changes Dec 6, 2019
View reviewed changes
Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

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

@petroborys Can you please rebase to resolve a conflict? Plus remove the merge commit as well.

@0xc0170 0xc0170 requested a review from a team December 6, 2019 14:45
@petroborys
modified itm_api.c for STK3701 and add SWO location 0 to EFM32GG11_ST…
2525100 
…K3701, EFM32GG_STK3700, EFM32LG_STK3600, EFM32PG_STK3401, EFM32PG12_STK3402 and EFM32WG_STK3800
@petroborys
Copy link
Contributor Author

@petroborys Can you please rebase to resolve a conflict? Plus remove the merge commit as well.

Ok, sure

@0xc0170 0xc0170 self-requested a review December 9, 2019 08:12
0xc0170
0xc0170 reviewed Dec 9, 2019
View reviewed changes
targets/targets.json
@@ -6970,7 +6971,8 @@
"USTICKER",
"TRNG",
"FLASH",
"MPU"
"MPU",
"WATCHDOG"
Copy link
Contributor

Choose a reason for hiding this comment

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

what is this watchdog change, is it just reorg or was watchdog actually added ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it just reorg to fix the conflict.

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 9, 2019

Started CI

@mbed-ci
Copy link

mbed-ci commented Dec 9, 2019

Test run: FAILED

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

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 9, 2019

Test was aborted, will investigate why it took so long (cc @ARMmbed/mbed-os-test ).

Will restart once we complete 5.15rc2 testing

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 9, 2019

test restarted

@0xc0170 0xc0170 added release-version: 6.0.0-alpha-1 First pre-release version of 6.0.0 and removed needs: CI labels Dec 10, 2019
@0xc0170 0xc0170 merged commit b7c3b35 into ARMmbed:master Dec 10, 2019
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

@stevew817 stevew817 stevew817 approved these changes

Assignees
No one assigned
Labels
release-version: 6.0.0-alpha-1 First pre-release version of 6.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@petroborys @ciarmcom @0xc0170 @mbed-ci @stevew817