ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMSIS: Update upstream importer to import to new directory structure 

See docs/adr/0001_cmsis_component_source_structure_recommendations.md
pull/13464/head
Hugues Kamba 2020-08-24 14:25:20 +01:00
parent 5eb7285324
commit 5535eee91b
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/importer/README.md
View File

@ -22,7 +22,7 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
"files" : [ "files" : [
{ {
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c", "src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Source/mbed_tz_context.c"
}, },
... ...
{ {
@ -33,7 +33,7 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
"folders" : [ "folders" : [
{ {
"src_folder" : "CMSIS/Core/Include/", "src_folder" : "CMSIS/Core/Include/",
"dest_folder" : "cmsis/TARGET_CORTEX_M/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Include"
}, },
... ...
{ {

70
tools/importer/cmsis_importer.json
View File

@ -2,145 +2,145 @@
"files" : [ "files" : [
{ {
"src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c", "src_file" : "CMSIS/Core/Template/ARMv8-M/tz_context.c",
"dest_file" : "cmsis/TARGET_CORTEX_M/mbed_tz_context.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Source/mbed_tz_context.c"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Config/handlers.c", "src_file" : "CMSIS/RTOS2/RTX/Config/handlers.c",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/TARGET_CORTEX_A/handlers.c"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.h", "src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.h",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.h"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.c", "src_file" : "CMSIS/RTOS2/RTX/Config/RTX_Config.c",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Config/RTX_Config.c"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm0.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mbl.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mbl.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm3.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm3.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mml.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_armv8mml.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm4f.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_cm4f.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_ca.s", "src_file" : "CMSIS/RTOS2/RTX/Source/ARM/irq_ca.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm0.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mbl.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mbl.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm3.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm3.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_armv8mml.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm4f.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_cm4f.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_ca.S", "src_file" : "CMSIS/RTOS2/RTX/Source/GCC/irq_ca.S",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm0.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_common.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm3.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mml_common.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm4f.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_cm4f.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/Source/os_systick.c", "src_file" : "CMSIS/RTOS2/Source/os_systick.c",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/Source/os_systick.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/Source/os_systick.c"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_ca.s", "src_file" : "CMSIS/RTOS2/RTX/Source/IAR/irq_ca.s",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S"
}, },
{ {
"src_file" : "CMSIS/RTOS2/RTX/Library/cmsis_os1.c", "src_file" : "CMSIS/RTOS2/RTX/Library/cmsis_os1.c",
"dest_file" : "rtos/source/TARGET_CORTEX/rtx4/cmsis_os1.c" "dest_file" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Library/cmsis_os1.c"
} }
], ],
"folders" : [ "folders" : [
{ {
"src_folder" : "CMSIS/Core/Include/", "src_folder" : "CMSIS/Core/Include/",
"dest_folder" : "cmsis/TARGET_CORTEX_M/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/Include"
}, },
{ {
"src_folder" : "CMSIS/RTOS2/Include/", "src_folder" : "CMSIS/RTOS2/Include/",
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/Include/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/Include/"
}, },
{ {
"src_folder" : "CMSIS/RTOS2/RTX/Include1/", "src_folder" : "CMSIS/RTOS2/RTX/Include1/",
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx4/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include1/"
}, },
{ {
"src_folder" : "CMSIS/RTOS2/RTX/Include/", "src_folder" : "CMSIS/RTOS2/RTX/Include/",
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Include/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Include/"
}, },
{ {
"src_folder" : "CMSIS/RTOS2/RTX/Source/", "src_folder" : "CMSIS/RTOS2/RTX/Source/",
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/"
}, },
{ {
"src_folder" : "CMSIS/RTOS2/RTX/Source/", "src_folder" : "CMSIS/RTOS2/RTX/Source/",
"dest_folder" : "rtos/source/TARGET_CORTEX/rtx5/RTX/Source/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/RTOS2/RTX/Source/"
}, },
{ {
"src_folder" : "CMSIS/Core_A/Include/", "src_folder" : "CMSIS/Core_A/Include/",
"dest_folder" : "cmsis/TARGET_CORTEX_A/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Include/"
}, },
{ {
"src_folder" : "CMSIS/Core_A/Source/", "src_folder" : "CMSIS/Core_A/Source/",
"dest_folder" : "cmsis/TARGET_CORTEX_A/" "dest_folder" : "cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/Source/"
} }
], ],
"commit_sha" : [ "commit_sha" : [