Skip to content
This repository was archived by the owner on Dec 18, 2025. It is now read-only.

Commit 9f9482a

Browse files
committed
Avoid duplicated code by placing general code for all three Core-Types in a generic folder.
The Core-Folder contains the generic code only. The specific code is placed in the folder Core_A/R/M and includes the generic code. CoreValidation: Adapt path changes for Cortex-M core
1 parent e94a962 commit 9f9482a

67 files changed

Lines changed: 8432 additions & 9662 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/caller-corevalidation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
paths:
77
- .github/workflows/caller-corevalidation.yml
88
- CMSIS/Core/**/*
9+
- CMSIS/Core_M/**/*
910
- CMSIS/Core_A/**/*
1011
- CMSIS/CoreValidation/**/*
1112
- Device/ARM/**/*

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches: [ develop ]
77
paths:
88
- 'CMSIS/Core/**'
9+
- 'CMSIS/Core_M/**'
910
- 'CMSIS/Core_A/**'
1011
- 'CMSIS/CoreValidation/**'
1112
- 'Device/ARM/**'
@@ -14,6 +15,7 @@ on:
1415
paths:
1516
- '.github/workflows/codeql-analysis.yml'
1617
- 'CMSIS/Core/**'
18+
- 'CMSIS/Core_M/**'
1719
- 'CMSIS/Core_A/**'
1820
- 'CMSIS/CoreValidation/**'
1921
- 'Device/ARM/**'

.github/workflows/fileheader.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [ develop ]
66
paths:
77
- 'CMSIS/Core/**'
8+
- 'CMSIS/Core_M/**'
89
- 'CMSIS/Core_A/**'
910
- 'CMSIS/RTOS2/Include/**'
1011
- 'CMSIS/RTOS2/Source/**'

ARM.CMSIS.pdsc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,15 +1698,23 @@ and 8-bit Java bytecodes in Jazelle state.
16981698
<components>
16991699
<!-- CMSIS-Core component -->
17001700
<component Cclass="CMSIS" Cgroup="CORE" Cversion="5.7.0" condition="ARMv6_7_8-M Device" >
1701+
<description>CMSIS-CORE for Cortex-A/R/M</description>
1702+
<files>
1703+
<!-- CPU independent -->
1704+
<file category="include" name="CMSIS/Core/"/>
1705+
</files>
1706+
</component>
1707+
1708+
<component Cclass="CMSIS" Cgroup="CORE" Cversion="5.6.0" condition="ARMv6_7_8-M Device" >
17011709
<description>CMSIS-CORE for Cortex-M, SC000, SC300, Star-MC1, ARMv8-M, ARMv8.1-M</description>
17021710
<files>
17031711
<!-- CPU independent -->
17041712
<file category="doc" name="CMSIS/Documentation/Core/html/index.html"/>
1705-
<file category="include" name="CMSIS/Core/Include/"/>
1706-
<file category="header" name="CMSIS/Core/Include/tz_context.h" condition="TrustZone"/>
1713+
<file category="include" name="CMSIS/Core_M/Include/"/>
1714+
<file category="header" name="CMSIS/Core_M/Include/tz_context.h" condition="TrustZone"/>
17071715
<!-- Code template -->
1708-
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/main_s.c" version="1.1.1" select="Secure mode 'main' module for ARMv8-M"/>
1709-
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/tz_context.c" version="1.1.1" select="RTOS Context Management (TrustZone for ARMv8-M)" />
1716+
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core_M/Template/ARMv8-M/main_s.c" version="1.1.1" select="Secure mode 'main' module for ARMv8-M"/>
1717+
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core_M/Template/ARMv8-M/tz_context.c" version="1.1.1" select="RTOS Context Management (TrustZone for ARMv8-M)" />
17101718
</files>
17111719
</component>
17121720

0 commit comments

Comments
 (0)