Skip to content

Commit 5535eee

Browse files
hugueskambahugueskamba
committed
CMSIS: Update upstream importer to import to new directory structure
See docs/adr/0001_cmsis_component_source_structure_recommendations.md
1 parent 5eb7285 commit 5535eee

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎tools/importer/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
2222
"files" : [
2323
{
2424
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
25-
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c"
25+
"dest_file" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Source/mbed_tz_context.c"
2626
},
2727
...
2828
{
@@ -33,7 +33,7 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
3333
"folders" : [
3434
{
3535
"src_folder" : "CMSIS/Core/Include/",
36-
"dest_folder" : "cmsis/TARGET_CORTEX_M/"
36+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Include"
3737
},
3838
...
3939
{

‎tools/importer/cmsis_importer.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,145 +2,145 @@
22
"files" : [
33
{
44
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
5-
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c"
5+
"dest_file" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Source/mbed_tz_context.c"
66
},
77
{
88
"src_file" : "CMSIS/RTOS2/RTX/Config/handlers.c",
9-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c"
9+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/TARGET_CORTEX_A/handlers.c"
1010
},
1111
{
1212
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.h",
13-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h"
13+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.h"
1414
},
1515
{
1616
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.c",
17-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c"
17+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.c"
1818
},
1919
{
2020
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
21-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S"
21+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S"
2222
},
2323
{
2424
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
25-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S"
25+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S"
2626
},
2727
{
2828
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mbl.s",
29-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S"
29+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S"
3030
},
3131
{
3232
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm3.s",
33-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S"
33+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S"
3434
},
3535
{
3636
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mml.s",
37-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S"
37+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S"
3838
},
3939
{
4040
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm4f.s",
41-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S"
41+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S"
4242
},
4343
{
4444
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_ca.s",
45-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S"
45+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S"
4646
},
4747
{
4848
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
49-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S"
49+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S"
5050
},
5151
{
5252
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
53-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S"
53+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S"
5454
},
5555
{
5656
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mbl.S",
57-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S"
57+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S"
5858
},
5959
{
6060
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm3.S",
61-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S"
61+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S"
6262
},
6363
{
6464
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S",
65-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S"
65+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S"
6666
},
6767
{
6868
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm4f.S",
69-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S"
69+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S"
7070
},
7171
{
7272
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_ca.S",
73-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S"
73+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S"
7474
},
7575
{
7676
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
77-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S"
77+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S"
7878
},
7979
{
8080
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
81-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S"
81+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S"
8282
},
8383
{
8484
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s",
85-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S"
85+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S"
8686
},
8787
{
8888
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s",
89-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S"
89+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S"
9090
},
9191
{
9292
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s",
93-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S"
93+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S"
9494
},
9595
{
9696
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm4f.s",
97-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S"
97+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S"
9898
},
9999
{
100100
"src_file" : "CMSIS/RTOS2/Source/os_systick.c",
101-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/Source/os_systick.c"
101+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/Source/os_systick.c"
102102
},
103103
{
104104
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_ca.s",
105-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S"
105+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S"
106106
},
107107
{
108108
"src_file" : "CMSIS/RTOS2/RTX/Library/cmsis_os1.c",
109-
"dest_file" : "rtos/source/TARGET_CORTEX/rtx4/cmsis_os1.c"
109+
"dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Library/cmsis_os1.c"
110110
}
111111
],
112112
"folders" : [
113113
{
114114
"src_folder" : "CMSIS/Core/Include/",
115-
"dest_folder" : "cmsis/TARGET_CORTEX_M/"
115+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Include"
116116
},
117117
{
118118
"src_folder" : "CMSIS/RTOS2/Include/",
119-
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/Include/"
119+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/Include/"
120120
},
121121
{
122122
"src_folder" : "CMSIS/RTOS2/RTX/Include1/",
123-
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx4/"
123+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include1/"
124124
},
125125
{
126126
"src_folder" : "CMSIS/RTOS2/RTX/Include/",
127-
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Include/"
127+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/"
128128
},
129129
{
130130
"src_folder" : "CMSIS/RTOS2/RTX/Source/",
131-
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/"
131+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/"
132132
},
133133
{
134134
"src_folder" : "CMSIS/RTOS2/RTX/Source/",
135-
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/"
135+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/"
136136
},
137137
{
138138
"src_folder" : "CMSIS/Core_A/Include/",
139-
"dest_folder" : "cmsis/TARGET_CORTEX_A/"
139+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Include/"
140140
},
141141
{
142142
"src_folder" : "CMSIS/Core_A/Source/",
143-
"dest_folder" : "cmsis/TARGET_CORTEX_A/"
143+
"dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Source/"
144144
}
145145
],
146146
"commit_sha" : [

0 commit comments

Comments
 (0)