diff --git a/bsp/xplorer4330/Libraries/Device/NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx_m0sub.c b/bsp/xplorer4330/Libraries/Device/NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx_m0sub.c index 5f6233ad0ec06b11413011902b27ad7af5fd0d87..33668ef37d7235ecd51649013ea934751f69f00b 100644 --- a/bsp/xplorer4330/Libraries/Device/NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx_m0sub.c +++ b/bsp/xplorer4330/Libraries/Device/NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx_m0sub.c @@ -73,7 +73,8 @@ WEAK void SysTick_Handler(void); WEAK void IntDefaultHandler(void); #else WEAK void M0S_NMI_Handler(void); -WEAK void M0S_HardFault_Handler (void); +WEAK void M0S_HardFault_Handler(void); +WEAK void M0S_DebugMon_Handler(void); WEAK void M0S_SVC_Handler(void); WEAK void M0S_PendSV_Handler(void); WEAK void M0S_SysTick_Handler(void); diff --git a/bsp/xplorer4330/Libraries/Device/SConscript b/bsp/xplorer4330/Libraries/Device/SConscript index d0aac1b07063bfd41a3652f53ccc2d072410fe9e..a6ea5ee936d115205994369bdc18c35110c0deb9 100644 --- a/bsp/xplorer4330/Libraries/Device/SConscript +++ b/bsp/xplorer4330/Libraries/Device/SConscript @@ -13,14 +13,14 @@ CPPDEFINES = [rtconfig.USE_CORE + ' USE_SPIFI'] # add for startup script if rtconfig.USE_CORE =='CORE_M4': if rtconfig.CROSS_TOOL == 'gcc': - src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] + src += ['NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx.c'] elif rtconfig.CROSS_TOOL == 'keil': src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: if rtconfig.CROSS_TOOL == 'gcc': - src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] + src += ['NXP/LPC43xx/Source/Templates/GCC/cr_startup_lpc43xx_m0sub.c'] elif rtconfig.CROSS_TOOL == 'keil': src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] elif rtconfig.CROSS_TOOL == 'iar': diff --git a/bsp/xplorer4330/libraries/SConscript b/bsp/xplorer4330/Libraries/SConscript similarity index 100% rename from bsp/xplorer4330/libraries/SConscript rename to bsp/xplorer4330/Libraries/SConscript diff --git a/bsp/xplorer4330/m4/SConscript b/bsp/xplorer4330/M4/SConscript similarity index 100% rename from bsp/xplorer4330/m4/SConscript rename to bsp/xplorer4330/M4/SConscript diff --git a/bsp/xplorer4330/m4/SConstruct b/bsp/xplorer4330/M4/SConstruct similarity index 100% rename from bsp/xplorer4330/m4/SConstruct rename to bsp/xplorer4330/M4/SConstruct diff --git a/bsp/xplorer4330/m4/project.uvopt b/bsp/xplorer4330/M4/project.uvopt similarity index 100% rename from bsp/xplorer4330/m4/project.uvopt rename to bsp/xplorer4330/M4/project.uvopt diff --git a/bsp/xplorer4330/m4/project.uvproj b/bsp/xplorer4330/M4/project.uvproj similarity index 100% rename from bsp/xplorer4330/m4/project.uvproj rename to bsp/xplorer4330/M4/project.uvproj diff --git a/bsp/xplorer4330/m4/rtconfig.h b/bsp/xplorer4330/M4/rtconfig.h similarity index 100% rename from bsp/xplorer4330/m4/rtconfig.h rename to bsp/xplorer4330/M4/rtconfig.h diff --git a/bsp/xplorer4330/m4/rtconfig.py b/bsp/xplorer4330/M4/rtconfig.py similarity index 100% rename from bsp/xplorer4330/m4/rtconfig.py rename to bsp/xplorer4330/M4/rtconfig.py diff --git a/bsp/xplorer4330/m4/template.uvproj b/bsp/xplorer4330/M4/template.uvproj similarity index 100% rename from bsp/xplorer4330/m4/template.uvproj rename to bsp/xplorer4330/M4/template.uvproj