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.

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

Split devices in family files #341

Merged
merged 6 commits into from
May 24, 2024

Conversation

xanthio
Copy link
Contributor

@xanthio xanthio commented May 12, 2024

Contribution aiming to ease project maintenance:

  1. We want to get rid off the large cube/cmsis/hal lists because:
    • they become larger when ST releases new families
    • concurrent PR for updates create conflicts are they touch the same lines
  2. I think minimizing the amount of file edited to introduction new family would encourage contributions

This major change was the opportunity to use the latest version of each ST repo.
But this needs 2 changes:

  1. Better definition of shared memory block MB2 in generated linker script because WB startup initializes this memory area
  2. Add a definition for MP1 family because clocks default values are set in HAL and CMSIS system_<device>.c doesn't include it if USE_HAL_DRIVER is not defined

@xanthio
Copy link
Contributor Author

xanthio commented May 12, 2024

@Hish15: Here is the first maintenance PR

Copy link
Collaborator

@Hish15 Hish15 left a comment

Choose a reason for hiding this comment

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

WIP : I checked that all devices are properly moved 👍🏿
The CUBE/CMSIS/HAL must not be changed in this PR

Comment on lines 109 to 111
set(CUBE_F0_VERSION v1.11.5)
set(CMSIS_F0_VERSION v2.3.7)
set(HAL_F0_VERSION v1.7.8)
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 change anything on PR that moves so many things around

Suggested change
set(CUBE_F0_VERSION v1.11.5)
set(CMSIS_F0_VERSION v2.3.7)
set(HAL_F0_VERSION v1.7.8)
set(CUBE_F0_VERSION v1.11.2)
set(CMSIS_F0_VERSION v2.3.5)
set(HAL_F0_VERSION v1.7.5)

Comment on lines 184 to 186
set(CUBE_F1_VERSION v1.8.5)
set(CMSIS_F1_VERSION v4.3.4)
set(HAL_F1_VERSION v1.1.9)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_F1_VERSION v1.8.5)
set(CMSIS_F1_VERSION v4.3.4)
set(HAL_F1_VERSION v1.1.9)
set(CUBE_F1_VERSION v1.8.4)
set(CMSIS_F1_VERSION v4.3.3)
set(HAL_F1_VERSION v1.1.8)

Comment on lines 88 to 90
set(CUBE_F2_VERSION v1.9.4)
set(CMSIS_F2_VERSION v2.2.6)
set(HAL_F2_VERSION v1.2.8)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_F2_VERSION v1.9.4)
set(CMSIS_F2_VERSION v2.2.6)
set(HAL_F2_VERSION v1.2.8)
set(CUBE_F2_VERSION v1.9.3)
set(CMSIS_F2_VERSION v2.2.5)
set(HAL_F2_VERSION v1.2.7)

Comment on lines 139 to 141
set(CUBE_F3_VERSION v1.11.5)
set(CMSIS_F3_VERSION v2.3.8)
set(HAL_F3_VERSION v1.5.8)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_F3_VERSION v1.11.5)
set(CMSIS_F3_VERSION v2.3.8)
set(HAL_F3_VERSION v1.5.8)
set(CUBE_F3_VERSION v1.11.2)
set(CMSIS_F3_VERSION v2.3.5)
set(HAL_F3_VERSION v1.5.5)

Comment on lines 121 to 123
set(CUBE_F7_VERSION v1.17.1)
set(CMSIS_F7_VERSION v1.2.8)
set(HAL_F7_VERSION v1.3.0)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_F7_VERSION v1.17.1)
set(CMSIS_F7_VERSION v1.2.8)
set(HAL_F7_VERSION v1.3.0)
set(CUBE_F7_VERSION v1.16.1)
set(CMSIS_F7_VERSION v1.2.6)
set(HAL_F7_VERSION v1.2.9)

Comment on lines 139 to 141
set(CUBE_G0_VERSION v1.6.2)
set(CMSIS_G0_VERSION v1.4.4)
set(HAL_G0_VERSION v1.4.6)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_G0_VERSION v1.6.2)
set(CMSIS_G0_VERSION v1.4.4)
set(HAL_G0_VERSION v1.4.6)
set(CUBE_G0_VERSION v1.4.1)
set(CMSIS_G0_VERSION v1.4.0)
set(HAL_G0_VERSION v1.4.1)

Comment on lines 130 to 132
set(CUBE_G4_VERSION v1.5.2)
set(CMSIS_G4_VERSION v1.2.3)
set(HAL_G4_VERSION v1.2.3)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
set(CUBE_G4_VERSION v1.5.2)
set(CMSIS_G4_VERSION v1.2.3)
set(HAL_G4_VERSION v1.2.3)
set(CUBE_G4_VERSION v1.4.0)
set(CMSIS_G4_VERSION v1.2.1)
set(HAL_G4_VERSION v1.2.1)

@xanthio
Copy link
Contributor Author

xanthio commented May 20, 2024

The CUBE/CMSIS/HAL must not be changed in this PR

OK if we keep no-updated version of CUBE/CMSIS/HAL we need to not change LD and MP1 CI

@xanthio xanthio requested a review from Hish15 May 20, 2024 20:26
Copy link
Collaborator

@Hish15 Hish15 left a comment

Choose a reason for hiding this comment

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

@atsju please have a look and merge this, for me it's good to go.

@Hish15 Hish15 merged commit 369b66d into ObKo:master May 24, 2024
20 checks passed
@xanthio xanthio deleted the maintenance/split-devices-in-family-files branch May 24, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants