From ed9828226a41216626b2dcea09d80067d1cebcd3 Mon Sep 17 00:00:00 2001 From: "onelife.real" Date: Tue, 29 Nov 2011 09:15:10 +0000 Subject: *** EFM32 branch *** 1. Move file, "start_gcc.S", from "libcpu/arm/cortex-m3/" to "bsp/efm32/" 2. Upgrade EFM32 driver libraries (CMSIS and efm32lib) to version 2.2.2 3. Upgrade EFM32 G2xx development kit drivers (EFM32_Gxxx_DK) to version 1.7.2 (from version 1.6.0) 4. Modify the files ("drv_usart.c" and "drv_iic.c") according to the driver libraries upgrading git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1818 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/efm32/Libraries/SConscript | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'bsp/efm32/Libraries/SConscript') diff --git a/bsp/efm32/Libraries/SConscript b/bsp/efm32/Libraries/SConscript index 1fcddb8964..9fc6c7d81c 100644 --- a/bsp/efm32/Libraries/SConscript +++ b/bsp/efm32/Libraries/SConscript @@ -1,7 +1,9 @@ import rtconfig -Import('RTT_ROOT') from building import * +# get current directory +cwd = GetCurrentDir() + # The set of source files associated with this SConscript file. src = Split(""" CMSIS/CM3/CoreSupport/core_cm3.c @@ -47,11 +49,11 @@ startup_scripts['TinyGecko'] = 'startup_efm32tg.s' # add startup script src = src + ['CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/startup/cs3/' + startup_scripts[rtconfig.EFM32_FAMILY]] -path = [RTT_ROOT + '/bsp/efm32/Libraries/efm32lib/inc', - RTT_ROOT + '/bsp/efm32/Libraries/CMSIS/CM3/CoreSupport', - RTT_ROOT + '/bsp/efm32/Libraries/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32'] +path = [cwd + '/efm32lib/inc', + cwd + '/CMSIS/CM3/CoreSupport', + cwd + '/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32'] -CPPDEFINES = ['USE_STDPERIPH_DRIVER', rtconfig.EFM32_TYPE] +CPPDEFINES = [rtconfig.EFM32_TYPE] group = DefineGroup('EFM32_StdPeriph', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') -- cgit v1.3.1