Skip to content

Fix build errors for bare metal greentea tests on NRF52840_DK #12039

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 1 commit into from
Dec 6, 2019

Conversation

evedon
Copy link
Contributor

@evedon evedon commented Dec 5, 2019

Summary of changes

CI nightly tests are not building on NRF52840_DK with the following errors:

/usr/local/Cellar/arm-none-eabi-gcc/8-2018-q4-major/gcc/bin/../lib/gcc/arm-none-eabi/8.2.1/../../../../arm-none-eabi/bin/ld: 
BUILD/tests/NRF52840_DK/GCC_ARM/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.o: in function `get_usb_phy()':
./targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/USBPhy_Nordic.cpp:53: multiple definition of `get_usb_phy()'; BUILD/tests/NRF52840_DK/GCC_ARM/hal/usb/mbed_usb_phy.o:
./hal/usb/mbed_usb_phy.cpp:25: first defined here

The solution is to fix the target override in baremetal.json which was wrongly removing USBDEVICE (similarly for EMAC).

Impact of changes

Migration actions required

Documentation


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[X] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Covered by CI nightly tests.


Reviewers


@ciarmcom ciarmcom requested a review from a team December 5, 2019 18:00
@ciarmcom
Copy link
Member

ciarmcom commented Dec 5, 2019

@evedon, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@@ -1,12 +1,12 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

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

@rajkan01 Please fix your editor to remove trailing spaces by default

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 6, 2019

@evedon I set this for 5.15.0rc2 ?

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 6, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Dec 6, 2019

Test run: SUCCESS

Summary: 5 of 5 test jobs passed
Build number : 1
Build artifacts

@evedon
Copy link
Contributor Author

evedon commented Dec 6, 2019

Discussed with @jamesbeyond We can put it in 5.15 to allow user to manually run greentea tests in bare metal mode for this target.

@0xc0170
Copy link
Contributor

0xc0170 commented Dec 6, 2019

@jamesbeyond @rajkan01 Please review

Copy link
Contributor

@jamesbeyond jamesbeyond left a comment

Choose a reason for hiding this comment

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

LGTM

@0xc0170 0xc0170 merged commit 0175a9f into ARMmbed:master Dec 6, 2019
@evedon evedon deleted the ed-baremetal-nrf52840 branch January 9, 2020 13:03
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