Skip to content

Conversation

@gmarull
Copy link
Member

@gmarull gmarull commented Jun 29, 2023

Move the CMSIS glue code to modules/cmsis. Refer to commits for more details.

@zephyrbot zephyrbot added manifest manifest-cmsis DNM This PR should not be merged (Do Not Merge) labels Jun 29, 2023
@zephyrbot
Copy link

zephyrbot commented Jun 29, 2023

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

Name Old Revision New Revision Diff
cmsis zephyrproject-rtos/cmsis@74981bf zephyrproject-rtos/cmsis@1abf291 (master) zephyrproject-rtos/[email protected]
mcuboot zephyrproject-rtos/mcuboot@fc658eb zephyrproject-rtos/mcuboot@010019e (main) zephyrproject-rtos/[email protected]

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

carlescufi
carlescufi previously approved these changes Aug 23, 2023
gmarull and others added 6 commits August 23, 2023 18:41
Move CMSIS module Kconfig options to a folder, in preparation for CMSIS
core header creation.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
The CMSIS module glue code was part of arch/ directory. Move it to
modules/cmsis, and provide a single entry point for it: cmsis_core.h.
This entry header will include the right CMSIS header (M or A/R).

To make this change possible, CMSIS module Kconfig/CMake are declared as
external, allowing us to add a new Zephyr include directory.

All files including CMSIS have been updated.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
To ease migration of out-of-tree code, re-introduce previous CMSIS
headers that when include generate a warning informing about the
replacement header.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
CMSIS header is now generic.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Some files included <cmsis_core.h> for nothing, delete it.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
CMSIS header is now generic.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull
Copy link
Member Author

gmarull commented Aug 23, 2023

last push: updated module SHAs

@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Aug 23, 2023
@carlescufi carlescufi merged commit b5bfe0a into zephyrproject-rtos:main Aug 24, 2023
@gmarull gmarull deleted the cmsis-cleanup branch August 24, 2023 11:29
hasheddan added a commit to hasheddan/wasm-micro-runtime that referenced this pull request Nov 10, 2023
Fixes the import path for CMSIS in Zephyr versions > 3.4.

See zephyrproject-rtos/zephyr#59855 for more
information.

Signed-off-by: Daniel Mangum <[email protected]>
hasheddan added a commit to hasheddan/wasm-micro-runtime that referenced this pull request Nov 10, 2023
Fixes the import path for CMSIS in Zephyr versions > 3.4.

See zephyrproject-rtos/zephyr#59855 for more
information.

Signed-off-by: Daniel Mangum <[email protected]>
wenyongh pushed a commit to bytecodealliance/wasm-micro-runtime that referenced this pull request Nov 10, 2023
Fixes the import path for CMSIS in Zephyr versions > 3.4.

See zephyrproject-rtos/zephyr#59855 for more
information.

Signed-off-by: Daniel Mangum <[email protected]>
vickiegpt pushed a commit to vickiegpt/wamr-aot-gc-checkpoint-restore that referenced this pull request May 27, 2024
Fixes the import path for CMSIS in Zephyr versions > 3.4.

See zephyrproject-rtos/zephyr#59855 for more
information.

Signed-off-by: Daniel Mangum <[email protected]>
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.

10 participants