search

ARMmbed / mbed-os

Arm Mbed OS is a platform operating system designed for the internet of things
https://mbed.com
Other
4.68k stars 2.98k forks source link

CMSIS importer has merge conflicts #9230

Closed mikisch81 closed 5 years ago

mikisch81 commented 5 years ago

Description

When running the CMSIS importer on mbed-OS master branch there are merge conflicts when cherry-picking the commit-SHA list 

> python tools\importer\importer.py -c tools\importer\cmsis_importer.json -r C:\projects\tfm_base\CMSIS_5 -l DEBUG
DEBUG:Importer:[Exec] g i t   l o g   - - p r e t t y = f o r m a t : % h   - n   1
INFO:Importer:CMSIS_5 SHA = 0b521765
DEBUG:Importer:[Exec] g i t   b r a n c h
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Config\TARGET_CORTEX_A\handlers.c
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Config\RTX_Config.h
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Config\RTX_Config.c
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_M0\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_M0P\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_M0\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_M0P\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_M0\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_M0P\irq_cm0.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_M23\irq_armv8mbl.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_M23\irq_armv8mbl.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_M3\irq_cm3.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_M3\irq_cm3.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_M3\irq_cm3.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_M33\irq_armv8mml.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_M33\irq_armv8mml.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_RTOS_M4_M7\irq_cm4f.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_RTOS_M4_M7\irq_cm4f.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_RTOS_M4_M7\irq_cm4f.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_ARM\TARGET_CORTEX_A\irq_ca.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_GCC\TARGET_CORTEX_A\irq_ca.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_CORTEX_A\irq_ca.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_M23\irq_armv8mbl_common.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx5\RTX\Source\TOOLCHAIN_IAR\TARGET_M33\irq_armv8mml_common.S
DEBUG:Importer:Deleted: rtos\TARGET_CORTEX\rtx4\cmsis_os1.c
DEBUG:Importer:Deleted = {u'dest_folder': u'cmsis/TARGET_CORTEX_M/', u'src_folder': u'CMSIS/Core/Include/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx5/Include/', u'src_folder': u'CMSIS/RTOS2/Include/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx5/Source/', u'src_folder': u'CMSIS/RTOS2/Source/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx4/', u'src_folder': u'CMSIS/RTOS2/RTX/Include1/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx5/RTX/Include/', u'src_folder': u'CMSIS/RTOS2/RTX/Include/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx5/RTX/Source/', u'src_folder': u'CMSIS/RTOS2/RTX/Source/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'rtos/TARGET_CORTEX/rtx5/RTX/Source/', u'src_folder': u'CMSIS/RTOS2/RTX/Source/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'cmsis/TARGET_CORTEX_A/', u'src_folder': u'CMSIS/Core_A/Include/'}
DEBUG:Importer:Deleted = {u'dest_folder': u'cmsis/TARGET_CORTEX_A/', u'src_folder': u'CMSIS/Core_A/Source/'}
INFO:Importer:Removed files/folders listed in json file
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\cmsis/TARGET_CORTEX_M/mbed_tz_context.c
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx4/cmsis_os1.c
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\cmsis/TARGET_CORTEX_M/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/Include/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/Source/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx4/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Include/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\rtos/TARGET_CORTEX/rtx5/RTX/Source/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\cmsis/TARGET_CORTEX_A/
DEBUG:Importer:Copied = c:\miki_dev\mbed-os_backup\cmsis/TARGET_CORTEX_A/
DEBUG:Importer:[Exec] g i t   c h e c k o u t   - b   f e a t u r e _ C M S I S _ 5 _ 0 b 5 2 1 7 6 5
Switched to a new branch 'feature_CMSIS_5_0b521765'
INFO:Importer:Branch created = feature_CMSIS_5_0b521765
DEBUG:Importer:[Exec] g i t   a d d   - A
DEBUG:Importer:[Exec] g i t   c o m m i t   - m   " [ C M S I S _ 5 ] :   U p d a t e d   t o   0 b 5 2 1 7 6 5 "
INFO:Importer:Commit added = c:\miki_dev\mbed-os_backup\cmsis/TARGET_CORTEX_A/
DEBUG:Importer:[Exec] g i t   c h e c k o u t   f e a t u r e _ C M S I S _ 5 _ 0 b 5 2 1 7 6 5
Already on 'feature_CMSIS_5_0b521765'
DEBUG:Importer:[Exec] g i t   c h e c k o u t   f e a t u r e _ C M S I S _ 5 _ 0 b 5 2 1 7 6 5
Already on 'feature_CMSIS_5_0b521765'
DEBUG:Importer:[Exec] g i t   l o g   - n   1
DEBUG:Importer:[Exec] g i t   c h e r r y - p i c k   - x   4 3 6 0 b 7 b b f 8 1 5 c 4 d 8 1 2 0 0 5 9 3 8 c 9 c 2 7 a f 1 9 9 8 0 3 a 9 7
INFO:Importer:Commit added = git cherry-pick -x 4360b7bbf815c4d812005938c9c27af199803a97
DEBUG:Importer:[Exec] g i t   c h e r r y - p i c k   - x   c c 2 e 0 5 1 7 e 1 c 6 4 4 0 a b f 8 8 f 2 8 1 5 b 8 e 1 5 0 1 a 5 5 c d d 4 d
INFO:Importer:Commit added = git cherry-pick -x cc2e0517e1c6440abf88f2815b8e1501a55cdd4d
DEBUG:Importer:[Exec] g i t   c h e r r y - p i c k   - x   b 8 8 2 5 4 8 0 9 e b 6 2 6 6 8 9 c 8 a e b 4 1 3 0 4 a 3 0 8 b f 4 e 3 4 a 0 4
INFO:Importer:Commit added = git cherry-pick -x b88254809eb626689c8aeb41304a308bf4e34a04
DEBUG:Importer:[Exec] g i t   c h e r r y - p i c k   - x   2 8 7 1 2 1 f f d c 4 c 9 c 1 9 f 9 c e 8 8 7 2 e 4 e d d 9 4 1 8 6 2 d a c a 1
error: could not apply 287121ffdc... CMSIS/RTX: Pre-processor defines used for assembly
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
ERROR:Importer:The command g i t   c h e r r y - p i c k   - x   2 8 7 1 2 1 f f d c 4 c 9 c 1 9 f 9 c e 8 8 7 2 e 4 e d d 9 4 1 8 6 2 d a c a 1 failed with return code: 1

Issue request type

[ ] Question
[ ] Enhancement
[X] Bug
mikisch81 commented 5 years ago

cc @deepikabhavnani

ciarmcom commented 5 years ago

Internal Jira reference: https://jira.arm.com/browse/MBOCUSTRIA-375

deepikabhavnani commented 5 years ago

@mikisch81 - Merge conflicts will be there since patches were applied on older version of CMSIS. As part of pulling in CMSIS code, we resolve the conflicts and update the last SHA's for reference.

Scripts helps in pulling the changes from CMSIS and to keep track of any needed changes over CMSIS code for Mbed OS. If we use the vanilla version of CMSIS it can be fully automated, but for now user has to resolve merge conflicts