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

manifest: hal_silabs: update module #70156

Merged
merged 1 commit into from
Mar 15, 2024
Merged

manifest: hal_silabs: update module #70156

merged 1 commit into from
Mar 15, 2024

Conversation

pepe2k
Copy link
Contributor

@pepe2k pepe2k commented Mar 13, 2024

Brings the following fix:
gecko/cmake: replace SOC_GECKO_SERIESx with SOC_FAMILY_SILABS_Sx

Fixes: #69902

@zephyrbot
Copy link
Collaborator

zephyrbot commented Mar 13, 2024 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_silabs zephyrproject-rtos/hal_silabs@59c6c6e zephyrproject-rtos/hal_silabs@442d0fb (master) zephyrproject-rtos/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@zephyrbot zephyrbot added manifest manifest-hal_silabs DNM This PR should not be merged (Do Not Merge) labels Mar 13, 2024
@pepe2k pepe2k mentioned this pull request Mar 13, 2024
Merged
fabiobaltieri
fabiobaltieri previously approved these changes Mar 13, 2024
View reviewed changes
@jerome-pouiller
Copy link
Contributor

I am not sure how the HWMv2 is going to be merged. I believe HWMv2 is not yet merged in master and this PR should target collab-hwm (while it currently targets "main").

@pepe2k
Copy link
Contributor Author

pepe2k commented Mar 13, 2024

@jerome-pouiller I thought HWMv2 got merged after the v3.6, am I missing something here? See: 8dc3f85

fabiobaltieri
fabiobaltieri reviewed Mar 13, 2024
View reviewed changes
west.yml Outdated Show resolved Hide resolved
@fabiobaltieri
Copy link
Member

I am not sure how the HWMv2 is going to be merged. I believe HWMv2 is not yet merged in master and this PR should target collab-hwm (while it currently targets "main").

Yeah it's been merged in #69607, I think the branch is being kept for historical reasons.

@jerome-pouiller
Copy link
Contributor

I am not sure how the HWMv2 is going to be merged. I believe HWMv2 is not yet merged in master and this PR should target collab-hwm (while it currently targets "main").

Yeah it's been merged in #69607, I think the branch is being kept for historical reasons.

Ok, commits have been squashed. That's why I was not able to find it. Sorry for the noise.

@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Mar 13, 2024
@pepe2k
manifest: hal_silabs: update module
c8c59bd 
Brings the following fix:
gecko/cmake: replace 'SOC_GECKO_SERIESx' with 'SOC_FAMILY_SILABS_Sx'

Fixes: zephyrproject-rtos#69902
Signed-off-by: Piotr Dymacz <[email protected]>
@fabiobaltieri
Copy link
Member

fabiobaltieri commented Mar 15, 2024 •
edited
Loading

anyone to do a second approval for this? it's fixing a build breakage from a hwmv2 regression

@fabiobaltieri fabiobaltieri merged commit 02b2be0 into zephyrproject-rtos:main Mar 15, 2024
23 checks passed
@pepe2k pepe2k deleted the main__hal-silabs-update branch March 18, 2024 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kartben kartben kartben approved these changes

@fabiobaltieri fabiobaltieri fabiobaltieri approved these changes

@jerome-pouiller jerome-pouiller jerome-pouiller approved these changes

@fkokosinski fkokosinski Awaiting requested review from fkokosinski

@carlescufi carlescufi Awaiting requested review from carlescufi

@de-nordic de-nordic Awaiting requested review from de-nordic

Assignees
No one assigned
Labels
manifest manifest-hal_silabs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Compile error while building tests\bluetooth\shell for Silabs board
5 participants
@pepe2k @zephyrbot @jerome-pouiller @fabiobaltieri @kartben