Skip to content

iar: remove nxp duplicate definitions #7640

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

Merged
merged 4 commits into from
Aug 8, 2018

Conversation

0xc0170
Copy link
Contributor

@0xc0170 0xc0170 commented Jul 30, 2018

Description

Fixes #7634

Removing 2 duplicates (one was even using wrong device - instead of ....5 was .....12)

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 3, 2018

@theotherjimmy / @adbridge can you verify these duplicates?

@0xc0170 0xc0170 requested a review from adbridge August 3, 2018 09:12
Copy link
Contributor

@adbridge adbridge left a comment

Choose a reason for hiding this comment

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

LGTM I see the incorrect duplicates are
"MK22DN512xxx5": {
"OGChipSelectEditMenu": "MK22FN512xxx12\tFreescale MK22FN512xxx12"
and
"MK22DN512xxx5": {
"OGChipSelectEditMenu": "MK22DN512xxx5\tNXP MK22DN512xxx5"

One 12 and one 5 as you say. Just need to double check that we are removing the correct one.

@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 3, 2018

One 12 and one 5 as you say. Just need to double check that we are removing the correct one.

Fixed. Based on the CMSIS pack info, K22F board should contain xxx12 MCU thus corrected and xxx5 removed as its not used anywhere.

Copy link
Contributor

@adbridge adbridge left a comment

Choose a reason for hiding this comment

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

Looks more consistent now.

@0xc0170 0xc0170 force-pushed the fix_iar_definition_duplicate branch from cb936a0 to 343640f Compare August 3, 2018 11:05
@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 3, 2018

IAR 7.80 has only xxx5 device (DNxxx5) thus using that one in case of IAR. Tested locally

@0xc0170 0xc0170 force-pushed the fix_iar_definition_duplicate branch 2 times, most recently from 84f018a to 6f8074d Compare August 3, 2018 11:16
0xc0170 added 2 commits August 3, 2018 12:17
Based on the https://www.keil.com/boards2/nxp/frdm_k22f/ - it contains xxx12 MCU.
However IAR 7.80 has only xxx5 version, thus leaving NXP added version as xxx5.
@0xc0170 0xc0170 force-pushed the fix_iar_definition_duplicate branch from 6f8074d to 6f6a516 Compare August 3, 2018 11:19
@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 3, 2018

uvision and IAR works. However for uvision, device_name seems to be deprecated (shows me deprecated in the device selection in uvision).

Copy link
Contributor

@mmahadevan108 mmahadevan108 left a comment

Choose a reason for hiding this comment

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

Thanks, looks good.

@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 6, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

@cmonr
Copy link
Contributor

cmonr commented Aug 7, 2018

@0xc0170 Could you locally confirm the error? It's possible this might be related to IAR issues we've been seeing, but it would be good to confirm first.

@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 7, 2018

@0xc0170 Could you locally confirm the error? It's possible this might be related to IAR issues we've been seeing, but it would be good to confirm first.

I did locally, but will do again the same as exporters do. It looks like this is error in this PR. I'll check

This fixes the failure for IAR regarding floating point.
@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 7, 2018

I was able to reproduce the failure. It should be now fixed!

@0xc0170
Copy link
Contributor Author

0xc0170 commented Aug 7, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 7, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Aug 7, 2018

@mbed-ci
Copy link

mbed-ci commented Aug 7, 2018

@cmonr cmonr merged commit 95c6233 into ARMmbed:master Aug 8, 2018
pan- pushed a commit to pan-/mbed that referenced this pull request Aug 22, 2018
…cate

iar: remove nxp duplicate definitions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants