diff --git a/bsp/lpc2148/SConscript b/bsp/lpc2148/SConscript index ab4ba595108c5af6f47c2bf89a0c28330e65a711..2a2a76c135b5e37a0d32ce4a40c269e92c7094a2 100644 --- a/bsp/lpc2148/SConscript +++ b/bsp/lpc2148/SConscript @@ -8,7 +8,7 @@ src_drv = [] src = src_bsp + src_drv -CPPPATH = [RTT_ROOT + '/bsp/lpc2148'] +CPPPATH = [ GetCurrentDir() ] CPPDEFINES = [] group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc2148/rtconfig.py b/bsp/lpc2148/rtconfig.py index 0c00e8584ee5d9f3b58b3124d96f9cf35996a4a3..b3bcd9d5820f3f13ec9c4dfc3a025ae66990a57c 100644 --- a/bsp/lpc2148/rtconfig.py +++ b/bsp/lpc2148/rtconfig.py @@ -1,7 +1,7 @@ # toolchains options ARCH='arm' CPU='lpc214x' -CROSS_TOOL='keil' +CROSS_TOOL='gcc' if CROSS_TOOL == 'gcc': PLATFORM = 'gcc' @@ -16,6 +16,7 @@ if PLATFORM == 'gcc': # toolchains PREFIX = 'arm-none-eabi-' CC = PREFIX + 'gcc' + CXX = PREFIX + 'g++' AS = PREFIX + 'gcc' AR = PREFIX + 'ar' LINK = PREFIX + 'gcc' @@ -27,7 +28,7 @@ if PLATFORM == 'gcc': DEVICE = ' -mcpu=arm7tdmi-s -mthumb' CFLAGS = DEVICE + ' -DRT_USING_MINILIBC' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp' - LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc2148.map,-cref,-u,Reset_Handler -T lpc2148_rom.ld' + LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc2148.map,-cref,-u,_start -T lpc2148_rom.ld' CPATH = '' LPATH = '' @@ -43,6 +44,7 @@ if PLATFORM == 'gcc': elif PLATFORM == 'armcc': # toolchains CC = 'armcc' + CXX = 'armcc' AS = 'armasm' AR = 'armar' LINK = 'armlink'