diff options
| author | dzzxzz <[email protected]> | 2011-07-04 05:50:17 +0000 |
|---|---|---|
| committer | dzzxzz <[email protected]> | 2011-07-04 05:50:17 +0000 |
| commit | bf7943c94b9048e6f34c6de3a202236459cb53ec (patch) | |
| tree | be31de0c0b87ffddaa0a867bbd73fb8187851b90 /bsp | |
| parent | 4bac05ffadf2b091b881a7ec56d1492f329b70e3 (diff) | |
stm32f10x branch support scons+iar compile
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1600 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/stm32f10x/SConstruct | 1 | ||||
| -rw-r--r-- | bsp/stm32f10x/rtconfig.py | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bsp/stm32f10x/SConstruct b/bsp/stm32f10x/SConstruct index a3183352d2..2151b715e5 100644 --- a/bsp/stm32f10x/SConstruct +++ b/bsp/stm32f10x/SConstruct @@ -17,6 +17,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar':
env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
+ env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map'])
Export('RTT_ROOT')
diff --git a/bsp/stm32f10x/rtconfig.py b/bsp/stm32f10x/rtconfig.py index 4ff5ccb580..474757e725 100644 --- a/bsp/stm32f10x/rtconfig.py +++ b/bsp/stm32f10x/rtconfig.py @@ -81,9 +81,9 @@ elif PLATFORM == 'iar': LINK = 'ilinkarm'
TARGET_EXT = 'out'
- DEVICE = ' --cpu DARMSTM --thumb'
+ DEVICE = ' -D USE_STDPERIPH_DRIVER' + ' -D STM32F10X_HD'
- CFLAGS = ''
+ CFLAGS = DEVICE
CFLAGS += ' --diag_suppress Pa050'
CFLAGS += ' --no_cse'
CFLAGS += ' --no_unroll'
@@ -97,9 +97,9 @@ elif PLATFORM == 'iar': CFLAGS += ' --cpu=Cortex-M3'
CFLAGS += ' -e'
CFLAGS += ' --fpu=None'
- CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/DLib_Config_Normal.h"'
+ CFLAGS += ' --dlib_config "' + IAR_PATH + '/arm/INC/c/DLib_Config_Normal.h"'
CFLAGS += ' -Ol'
- CFLAGS += ' -I"' + IAR_PATH + '/arm/inc"'
+ CFLAGS += ' --use_c++_inline'
AFLAGS = ''
AFLAGS += ' -s+'
@@ -107,7 +107,6 @@ elif PLATFORM == 'iar': AFLAGS += ' -r'
AFLAGS += ' --cpu Cortex-M3'
AFLAGS += ' --fpu None'
- AFLAGS += ' -I"' + IAR_PATH + '/arm/INC"'
LFLAGS = ' --config stm32f10x_flash.icf'
LFLAGS += ' --redirect _Printf=_PrintfTiny'
|