Skip to content

CMake: Fix the listing of system_clock.c for STM32F413xH #14104

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

Conversation

hugueskamba
Copy link
Collaborator

Summary of changes

Each variant now has its own system_clock.c file.
Therefore ensure the correct one is added for each variant.
Also reduce the number of CMakeLists.txt file as each
variant does not have significant number of files.

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

Reviewers


0xc0170
0xc0170 previously approved these changes Jan 4, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented Jan 4, 2021

I am addressing Travis failures with py3.5 in a separate PR. I've noticed it started failing just recently.

@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from d041758 to dd2729a Compare January 4, 2021 11:13
@mergify mergify bot dismissed 0xc0170’s stale review January 4, 2021 11:14

Pull request has been modified.

@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from dd2729a to 4393017 Compare January 4, 2021 11:14
@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from 4393017 to 0679e22 Compare January 4, 2021 12:07
@0xc0170
Copy link
Contributor

0xc0170 commented Jan 4, 2021

travis fix is on master. Please rebase all your PRs, it should fix it

@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from 9c2c367 to aaa133a Compare January 4, 2021 18:04
@hugueskamba
Copy link
Collaborator Author

travis fix is on master. Please rebase all your PRs, it should fix it

Done.

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 5, 2021

It's unfortunate but the move triggered astyle error, it is trivial to fix. Can you please?

@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from aaa133a to 0840419 Compare January 5, 2021 13:46
@hugueskamba
Copy link
Collaborator Author

It's unfortunate but the move triggered astyle error, it is trivial to fix. Can you please?

Done.

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 5, 2021

astyle still reports one (blank space on the line?)

@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from 0840419 to 6131481 Compare January 5, 2021 14:07
@hugueskamba
Copy link
Collaborator Author

hugueskamba commented Jan 5, 2021

astyle still reports one (blank space on the line?)

Done.

@adbridge adbridge added the release-type: patch Indentifies a PR as containing just a patch label Jan 6, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented Jan 11, 2021

Travis can't compile events:

./connectivity/drivers/cellular/TELIT/HE910/ONBOARD_TELIT_HE910.cpp:127:9: error: 'MDMRTS' was not declared in this scope
  127 |     if (MDMRTS != NC && MDMCTS != NC) {
      |         ^~~~~~
./connectivity/drivers/cellular/TELIT/HE910/ONBOARD_TELIT_HE910.cpp:127:25: error: 'MDMCTS' was not declared in this scope
  127 |     if (MDMRTS != NC && MDMCTS != NC) {

please review

Each variant now has its own system_clock.c file.
Therefore ensure the correct one is added for each variant.
Also reduce the number of CMakeLists.txt file as each
variant does not have significant number of files.
@hugueskamba hugueskamba force-pushed the hk_cmake_fix_STM32F413xH_sysclock_listing branch from 6131481 to 1a90deb Compare January 11, 2021 16:20
@hugueskamba
Copy link
Collaborator Author

This force-push moves ONBOARD_TELIT_HE910.cpp back to the
TARGET_MTS_DRAGONFLY_F413RH directory as it causes a build failure since
the file has STM specific symbols which cause non STM Mbed targets to fail
when building with the TELIT cellular driver.

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 11, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jan 11, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-test ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@0xc0170 0xc0170 merged commit 2e905a0 into ARMmbed:master Jan 14, 2021
@mergify mergify bot removed the ready for merge label Jan 14, 2021
@hugueskamba hugueskamba deleted the hk_cmake_fix_STM32F413xH_sysclock_listing branch January 14, 2021 17:30
@mbedmain mbedmain added release-version: 6.7.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jan 25, 2021
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