Skip to content

Update to v6.2.0 #4

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
Merged
merged 22 commits into from
Jun 23, 2025
Merged

Update to v6.2.0 #4

merged 22 commits into from
Jun 23, 2025

Conversation

@tpambor
Copy link

@tpambor tpambor commented Jun 20, 2025

Currently main is based on 783317a, a commit between v6.1.0 and v6.2.0, which is not an official release. As recommended by the upstream repository, "For stable versions ready for productive use please refer to tagged releases, like CMSIS 6.2.0." This update ensures that our project is aligned with a stable, supported, and production-ready version of CMSIS6.

This upgrade is a proactive measure to prepare for the upcoming Zephyr 4.2.0 release.

@tpambor tpambor mentioned this pull request Jun 20, 2025
Merged
KeilChris and others added 22 commits June 20, 2025 19:29
@KeilChris @tpambor
Update ARM.CMSIS.pdsc
8f4cf99 
Fixes requested in ARM-software#208
@ReinhardKeil @tpambor
fixed typo (ARM-software#212)
abe392a
@JonatanAntoni @tpambor
Fix workflows: Pin to Ubuntu 22.04
4258b01
@blckmn @tpambor
Update armv8m_mpu.h - adding void
3aea10e 
Removes error:
error: old-style function definition [-Werror=old-style-definition]
@JonatanAntoni @tpambor
Guard include of RTE_Components.h with presence of _RTE_
d8d5e4d 
Fixes ARM-software#205
@JonatanAntoni @tpambor
Enable CoreValidation on CM52 with LLVM/Clang 19
a27a981
@NVMarkovich @tpambor
Bug fix in GIC_GetConfiguration() (ARM-software#217)
c56f0eb 
Bit shift in accordance with IRQn % 16 was incorrect, and masking was
needed to extract only the IRQn bits. Both fixed.
@NVMarkovich @tpambor
Possible bugs in MMU_MemorySection(), MMU_MemoryPage() (ARM-software#219
ecdd649 
)

Need to be tested /reviewed, as I am not sure about the flag control
logic.
@Evagan2018 @tpambor
Replaced doc references (ARM-software#220)
415eb1f 
Replaced references to https://github.com/Open-CMSIS-Pack/cmsis-toolbox/... with
https://open-cmsis-pack.github.io/cmsis-toolbox/

Open-CMSIS-Pack/cmsis-toolbox#248
@MiloradCvjetkovic @tpambor
CMSIS-Driver: Minor update to USB Host Driver documentation (ARM-soft…
d07a5de 
…ware#225)

- remove references to deprecated HCI driver
@MiloradCvjetkovic @tpambor
Update driver api descriptions in ARM.CMSIS.pdsc (ARM-software#223)
bff729a
@MiloradCvjetkovic @tpambor
Remove CMSIS-Driver API header from custom component templates (ARM-s…
b7402a6 
…oftware#224)
@MiloradCvjetkovic @tpambor
CMSIS-Driver: Added vStream Driver API 1.0.0 (ARM-software#226)
c517695
@MiloradCvjetkovic @tpambor
CMSIS-Driver: Updated vStream Driver API to non-exclusive (ARM-softwa…
79acb0f 
…re#227)
@VladimirUmek @tpambor
Define linkage for the vStream and GPIO driver access structure (ARM-…
46e5572 
…software#231)
@Masmiseim36 @tpambor
Fix documentation of the Register HPPIR_INTID (ARM-software#233)
77d7f51 
Fix documentation of the Register HPPIR_INTID according to
"ARM Generic Interrupt Controller Architecture version 2.0 Architecture
Specification"
Table 4-41 GICC_HPPIR bit assignments


![409053189-dfa13d3e-1650-489b-a8f2-b061ac9afe17](https://github.com/user-attachments/assets/919edcce-ce77-450b-8839-af6555f2249a)
@NVMarkovich @tpambor
Update core_ca.h (ARM-software#216)
b14ccfc
@MiloradCvjetkovic @tpambor
CMSIS-Driver: Minor update to vStream Driver API documentation (ARM-s…
d8cc22e 
…oftware#238)
@JonatanAntoni @tpambor
Bump component version of CMSIS-Core to 6.1.1
7854cdd
@JonatanAntoni @tpambor
Bump CMSIS-Core documentation version and history
0b03607
@RobinKastberg @tpambor
IAR __get_SP_usr/__set_SP_usr fix (ARM-software#241)
bde0b68 
Inline assembler constraints were incorrect

Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>
@RobinKastberg @tpambor
IAR LDR{,B,H}T fix (ARM-software#242)
dccc7a5 
Inline assembler constraints were incorrect.

Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>
@tpambor tpambor mentioned this pull request Jun 21, 2025
Closed
@wearyzen wearyzen self-assigned this Jun 23, 2025
@wearyzen wearyzen self-requested a review June 23, 2025 14:52
@wearyzen
Copy link
Collaborator

Hi @tpambor thank you for taking the initiative. Before I approve this, may I ask what method did you chose to pick the commits? I would prefer to have git rebase v6.2.0 so that its easier to compare the history with upstream

@tpambor
Copy link
Author

tpambor commented Jun 23, 2025

Hi, I first merged v6.2.0 but that made the pipeline fail as the commit adopting for Zephyr was not present. I then updated the branch and rebased on top of master of this repo. This PR includes all commits from upstream until v6.2.0 from when it was forked.

@wearyzen
Copy link
Collaborator

HI @tpambor could you try this instead?

git remote add upupstream https://github.com/ARM-software/CMSIS_6.git
git fetch upupstream
git rebase v6.2.0

This is how my branch looks with these steps: main...wearyzen:CMSIS_6:cmsis_6_update_v6.2.0

@tpambor
Copy link
Author

tpambor commented Jun 23, 2025

Could be done like that. I think the downside is that this would remove the commit that current west.yml points to and could break things for anyone still using the old commit hash.

I have seen the method I used for other modules.

wearyzen
wearyzen approved these changes Jun 23, 2025
View reviewed changes
Copy link
Collaborator

@wearyzen wearyzen left a comment

Choose a reason for hiding this comment

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

fair enough

@wearyzen wearyzen merged commit 06d952b into zephyrproject-rtos:main Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wearyzen wearyzen wearyzen approved these changes

Assignees

@wearyzen wearyzen

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.