Merge remote-tracking branch 'upstream/master'

bsp/asm9260t/rtconfig.py

@@ -17,7 +17,7 @@ elif CROSS_TOOL == 'keil':
     EXEC_PATH   = 'C:/Keil_v5'
 elif CROSS_TOOL == 'iar':
     PLATFORM    = 'iar'
-    EXEC_PATH    = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0'
+    EXEC_PATH    = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
 
 if os.getenv('RTT_EXEC_PATH'):
     EXEC_PATH = os.getenv('RTT_EXEC_PATH')

bsp/tm4c129x/libraries/SConscript

@@ -6,18 +6,21 @@ from building import *
 cwd     = GetCurrentDir()
 src = Glob('driverlib/*.c')
 SrcRemove(src, 'onewire.c')
+CCFLAGS = ''
 
 # add for startup script 
 if rtconfig.CROSS_TOOL == 'gcc':
-	src += ['startup/startup_gcc.c']
+    src += ['startup/startup_gcc.c']
 elif rtconfig.CROSS_TOOL == 'keil':
-	src += ['startup/startup_rvmdk.S']
+    src += ['startup/startup_rvmdk.S']
 elif rtconfig.CROSS_TOOL == 'iar':
-	src += ['startup/startup_ewarm.c']
+    src += ['startup/startup_ewarm.c']
+    CCFLAGS += ' --diag_suppress=pe177'
 
 CPPPATH = [cwd, cwd + '/inc', cwd + '/driverlib']
 
+
 CPPDEFINES = [rtconfig.PART_TYPE]
-group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, CCFLAGS = CCFLAGS)
 
 Return('group')

bsp/tm4c129x/rtconfig.py

@@ -1,4 +1,4 @@
-# BSP Note: For TI EK-TM4C1294XL Tiva C Series Connected LancuhPad	(REV D)
+# BSP Note: For TI EK-TM4C1294XL Tiva C Series Connected LancuhPad    (REV D)
 
 import os
 
@@ -8,26 +8,24 @@ CPU='cortex-m4'
 CROSS_TOOL='keil'
 
 if os.getenv('RTT_CC'):
-	CROSS_TOOL = os.getenv('RTT_CC')
-	
+    CROSS_TOOL = os.getenv('RTT_CC')
+    
 #device options
 PART_TYPE = 'PART_TM4C129XNCZAD'
 # cross_tool provides the cross compiler
 # EXEC_PATH is the compiler execute path, for example, CodeSourcery, Keil MDK, IAR
 if  CROSS_TOOL == 'gcc':
-	PLATFORM 	= 'gcc'
-	EXEC_PATH 	= r'D:\ArdaArmTools\Sourcery_Lite\bin'
+    PLATFORM     = 'gcc'
+    EXEC_PATH    = r'D:\ArdaArmTools\Sourcery_Lite\bin'
 elif CROSS_TOOL == 'keil':
-	PLATFORM 	= 'armcc'
-	EXEC_PATH 	= r'D:\Keil_v5'
+    PLATFORM     = 'armcc'
+    EXEC_PATH    = r'C:\Keil_v5'
 elif CROSS_TOOL == 'iar':
-    print('================ERROR============================')
-    print('Not support iar yet!')
-    print('=================================================')
-    exit(0)	
-
+    PLATFORM     = 'iar'
+    EXEC_PATH    = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
+    
 if os.getenv('RTT_EXEC_PATH'):
-	EXEC_PATH = os.getenv('RTT_EXEC_PATH')
+    EXEC_PATH = os.getenv('RTT_EXEC_PATH')
 
 #BUILD = 'debug'
 BUILD = 'release'
@@ -43,7 +41,7 @@ if PLATFORM == 'gcc':
     SIZE = PREFIX + 'size'
     OBJDUMP = PREFIX + 'objdump'
     OBJCPY = PREFIX + 'objcopy'
-	
+    
     DEVICE = ' -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections'
     CFLAGS = DEVICE + ' -std=c99 -Dgcc'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb '
@@ -75,7 +73,7 @@ elif PLATFORM == 'armcc':
 
     CFLAGS += ' -I' + EXEC_PATH + '/ARM/ARMCC/INC'
     LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/ARMCC/LIB'
-	
+    
     EXEC_PATH += '/arm/armcc/bin/'
 
     if BUILD == 'debug':
@@ -85,3 +83,51 @@ elif PLATFORM == 'armcc':
         CFLAGS += ' -O2'
 
     POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
+
+elif PLATFORM == 'iar':
+    # toolchains
+    CC = 'iccarm'
+    AS = 'iasmarm'
+    AR = 'iarchive'
+    LINK = 'ilinkarm'
+    TARGET_EXT = 'out'
+
+    DEVICE = '-Dewarm' # + ' -D' + PART_TYPE
+
+    CFLAGS = DEVICE
+    CFLAGS += ' --diag_suppress Pa050'
+    CFLAGS += ' --no_cse' 
+    CFLAGS += ' --no_unroll' 
+    CFLAGS += ' --no_inline' 
+    CFLAGS += ' --no_code_motion' 
+    CFLAGS += ' --no_tbaa' 
+    CFLAGS += ' --no_clustering' 
+    CFLAGS += ' --no_scheduling' 
+
+    CFLAGS += ' --endian=little' 
+    CFLAGS += ' --cpu=Cortex-M4' 
+    CFLAGS += ' -e' 
+    CFLAGS += ' --fpu=VFPv4_sp'
+    CFLAGS += ' --dlib_config "' + EXEC_PATH + '/arm/INC/c/DLib_Config_Normal.h"'    
+    CFLAGS += ' --silent'
+
+    AFLAGS = DEVICE
+    AFLAGS += ' -s+' 
+    AFLAGS += ' -w+' 
+    AFLAGS += ' -r' 
+    AFLAGS += ' --cpu Cortex-M4' 
+    AFLAGS += ' --fpu VFPv4_sp' 
+    AFLAGS += ' -S'
+    
+    if BUILD == 'debug':
+        CFLAGS += ' --debug' 
+        CFLAGS += ' -On'    
+    else:
+        CFLAGS += ' -Oh'        
+    
+    LFLAGS = ' --config "tm4c_rom.icf"'
+    LFLAGS += ' --entry __iar_program_start'    
+    #LFLAGS += ' --silent'
+    
+    EXEC_PATH = EXEC_PATH + '/arm/bin/'
+    POST_ACTION = ''

components/libc/compilers/dlib/sys/time.h

@@ -20,7 +20,10 @@ struct timeval {
 };
 #endif /* _TIMEVAL_DEFINED */
 
-#if defined ( __ICCARM__ ) && (__VER__ >= 8011002)
+/*
+ * Skip define timespec for IAR version over 8.10.1 where __VER__ is 8010001.
+ */
+#if defined ( __ICCARM__ ) && (__VER__ >= 8010001)
 #define _TIMESPEC_DEFINED
 #endif