Skip to content

Clean up deprecated feature code #8685

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 6 commits into from
Nov 15, 2018

Conversation

bridadan
Copy link
Contributor

@bridadan bridadan commented Nov 8, 2018

Description

This is a follow up to #7799. Where that PR is expected to fail, this PR should pass CI. This is only cleaning up the use of deprecated features (and the generated macros) throughout the code base.

One thing to note, while rebasing this PR I noticed that #7592 removed a config test that used the UVISOR feature, but wasn't uVisor specific (it tested a real use case). I've readded this test case to gain the coverage and tweaked it to use other currently available FEATURES.

Pull request type

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

@cmonr cmonr requested a review from a team November 9, 2018 02:47
Copy link
Contributor

@cmonr cmonr left a comment

Choose a reason for hiding this comment

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

Looks fine, just curious what lib1 and lib2 are

@@ -2,7 +2,7 @@
"name": "lib1",
"target_overrides": {
"*": {
"target.features_add": ["IPV4"]
Copy link
Contributor

Choose a reason for hiding this comment

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

libl?

Also, it has a bootloader?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

lib1 and lib2 are just arbitrary names for "libraries" in this test. The name of the libraries don't matter and don't affect the contents of the test. They just need to be distinct.

It also doesn't actually have a bootloader, I just needed a feature label that wasn't deprecated. Strangely/happily enough, we don't have that many more deprecated feature labels! I picked the BOOTLOADER one since I figured that would be around the longest so I (hopefully) don't have to update these tests in the near future 😄

@NirSonnenschein
Copy link
Contributor

/morph build

@mbed-ci
Copy link

mbed-ci commented Nov 14, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Nov 14, 2018

@cmonr
Copy link
Contributor

cmonr commented Nov 14, 2018

Error: L6200E: Symbol __asm___9_fsl_rcm_c_75f9a447____REV16 multiply defined (by mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_rcm.o and mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_pmc.o).
Error: L6200E: Symbol __asm___9_fsl_rcm_c_75f9a447____REVSH multiply defined (by mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_rcm.o and mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_pmc.o).
Error: L6200E: Symbol __asm___9_fsl_rcm_c_75f9a447____RRX multiply defined (by mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_rcm.o and mbed-os/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_pmc.o).

Well, I suppose it has been a while since we've last seen this issue...

Will restart when able.

@mbed-ci
Copy link

mbed-ci commented Nov 14, 2018

@NirSonnenschein
Copy link
Contributor

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Nov 15, 2018

@cmonr cmonr merged commit fa2077d into ARMmbed:master Nov 15, 2018
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