浏览代码

[bsp] Fix compiling issue for LPC43xx

Bernard Xiong 10 年之前
父节点
当前提交
f301643494

+ 2 - 1
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);

+ 2 - 2
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':

+ 0 - 0
bsp/xplorer4330/libraries/SConscript → bsp/xplorer4330/Libraries/SConscript


+ 0 - 0
bsp/xplorer4330/m4/SConscript → bsp/xplorer4330/M4/SConscript


+ 0 - 0
bsp/xplorer4330/m4/SConstruct → bsp/xplorer4330/M4/SConstruct


+ 0 - 0
bsp/xplorer4330/m4/project.uvopt → bsp/xplorer4330/M4/project.uvopt


+ 0 - 0
bsp/xplorer4330/m4/project.uvproj → bsp/xplorer4330/M4/project.uvproj


+ 0 - 0
bsp/xplorer4330/m4/rtconfig.h → bsp/xplorer4330/M4/rtconfig.h


+ 0 - 0
bsp/xplorer4330/m4/rtconfig.py → bsp/xplorer4330/M4/rtconfig.py


+ 0 - 0
bsp/xplorer4330/m4/template.uvproj → bsp/xplorer4330/M4/template.uvproj