Skip to content
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

STM32G4 update drivers version to CUBE V1.4.0 #14592

Merged
merged 2 commits into from
May 24, 2021
Merged

STM32G4 update drivers version to CUBE V1.4.0 #14592

merged 2 commits into from
May 24, 2021

Conversation

JeanMarcR
Copy link
Contributor

Summary of changes

ST Cube drivers version is updated from V1.3.0 to V1.4.0
which is the latest official version from:

https://github.com/STMicroelectronics/STM32CubeG4/

@ARMmbed/team-st-mcd

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

@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Apr 26, 2021
@ciarmcom ciarmcom requested a review from a team April 26, 2021 07:30
@ciarmcom
Copy link
Member

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

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 26, 2021

@JeanMarcR Can you attach test report?

@JeanMarcR
Copy link
Contributor Author

I join test reports : platform NUCLEO_G474RE with AMR - GCC - IAR.

report__Test_MBED_OS_NUCLEO_G474RE_ARMC6__2021_04_16_09_43.log

report__Test_MBED_OS_NUCLEO_G474RE_GCC_ARM__2021_04_16_14_03.log
report__Test_MBED_OS_NUCLEO_G474RE_IAR__2021_04_16_14_48.log

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 26, 2021 •
edited
Loading

ARMC6 contains an error:

./targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver\stm32g4xx_hal_smbus.h:30:10: fatal error: 'stm32g4xx_hal_smbus_ex.h' file not found
#include "stm32g4xx_hal_smbus_ex.h"

But Gcc is all OK.

@JeanMarcR
Copy link
Contributor Author

Sorry I attached an old file. The test result for ARMC6 is the following one:
report__Test_MBED_OS_NUCLEO_G474RE_ARMC6__2021_04_16_13_24.log

@jeromecoutant
Copy link
Collaborator

ARMC6 contains an error:

@0xc0170 Where do you see this ?
It is OK on my side.

$ mbed test -m NUCLEO_G474RE -t ARM -v -n driver*echo | grep smbus -B2 -A2
...
Copy: stm32g4xx_hal_smbus_ex.h
Copy: stm32g4xx_hal_smbus.h
...

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 27, 2021

It was in the logs pasted there. All good now

jeromecoutant
jeromecoutant suggested changes Apr 27, 2021
View reviewed changes
targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/stm32g4xx_hal_conf.h Outdated
#endif

#if !defined (USE_HAL_CRYP_REGISTER_CALLBACKS)
#define USE_HAL_CRYP_REGISTER_CALLBACKS 0U
#if !defined (USE_HAL_CORDIC_REGISTER_CALLBACKS)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not correct here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK.

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/stm32g4xx_hal_conf.h Outdated
#endif

#if !defined (USE_HAL_HRTIM_REGISTER_CALLBACKS)
#define USE_HAL_HRTIM_REGISTER_CALLBACKS 0U
#if !defined (USE_HAL_FMAC_REGISTER_CALLBACKS)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not correct

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/system_stm32g4xx.c Outdated
#else
#include "nvic_addr.h" // MBED
SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
This value must be a multiple of 0x200. */
Copy link
Collaborator

Choose a reason for hiding this comment

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

Line to remove I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes probably. But I will run again the tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed the lines. No problem with our local tests.

@mergify
Copy link

mergify bot commented Apr 28, 2021

This PR cannot be merged due to conflicts. Please rebase to resolve them.

jeromecoutant
jeromecoutant suggested changes Apr 28, 2021
View reviewed changes
targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/system_stm32g4xx.c
Comment on lines -173 to -174
#include "nvic_addr.h" // MBED
SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
Copy link
Collaborator

Choose a reason for hiding this comment

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

This has been lost ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

@JeanMarcR JeanMarcR force-pushed the STM32G4_NEW_CUBE branch 2 times, most recently from 7bc1e69 to a755681 Compare May 3, 2021 14:04
jeromecoutant
jeromecoutant reviewed May 6, 2021
View reviewed changes
targets/TARGET_STM/README.md Outdated
@@ -67,8 +67,8 @@ This table summarizes the STM32Cube versions currently used in Mbed OS master br
| F3 | 1.11.2 | https://github.com/STMicroelectronics/STM32CubeF3 |
| F4 | 1.26.0 | https://github.com/STMicroelectronics/STM32CubeF4 |
| F7 | 1.16.0 | https://github.com/STMicroelectronics/STM32CubeF7 |
| G0 | 1.4.1 | https://github.com/STMicroelectronics/STM32CubeG0 |
| G4 | 1.1.0 | https://github.com/STMicroelectronics/STM32CubeG4 |
| G0 | 1.4.1 | https://github.com/STMicroelectronics/STM32CubeG0 |
Copy link
Collaborator

Choose a reason for hiding this comment

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

Don't touch this line :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/system_stm32g4xx.c Outdated
Comment on lines 123 to 124
#include "nvic_addr.h" // MBED
SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not sure it is the right place ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

@JeanMarcR JeanMarcR force-pushed the STM32G4_NEW_CUBE branch from a755681 to 331cf70 Compare May 6, 2021 11:49
@jeromecoutant
Copy link
Collaborator

Let's start CI ?

@0xc0170
Copy link
Contributor

0xc0170 commented May 17, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented May 17, 2021

Jenkins CI Test : ❌ FAILED

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

CLICK for Detailed Summary

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

@mergify mergify bot added needs: work and removed needs: CI labels May 17, 2021
@jeromecoutant
Copy link
Collaborator

Faked with NRF52840_DK-FPGA...
Restart CI ?

@0xc0170
Copy link
Contributor

0xc0170 commented May 18, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented May 18, 2021

Jenkins CI Test : ✔️ SUCCESS

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

CLICK for Detailed Summary

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

@adbridge adbridge merged commit 9e98a2c into ARMmbed:master May 24, 2021
@mergify mergify bot removed the ready for merge label May 24, 2021
@JeanMarcR JeanMarcR deleted the STM32G4_NEW_CUBE branch May 25, 2021 12:44
@mbedmain mbedmain added release-version: 6.12.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jun 18, 2021
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

@jeromecoutant jeromecoutant jeromecoutant approved these changes

Assignees
No one assigned
Labels
devices: st release-version: 6.12.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@JeanMarcR @ciarmcom @0xc0170 @jeromecoutant @mbed-ci @adbridge @mbedmain