1
0
Эх сурвалжийг харах

Correct rvds.S including for armclang platform.

Wayne Lin 4 жил өмнө
parent
commit
0da2fb5f9b

+ 0 - 1
bsp/nuvoton/numaker-m2354/README.md

@@ -41,7 +41,6 @@ Support GCC, MDK5, IAR IDE/compilers. More information of these compiler version
 
 Notice: 
 (1) Please install Nu-Link_Keil_Driver or Nu-Link_IAR_Driver for development.
-(2) You must remove '--c99' flag in <path/to/rtt>/components/drivers/spi/SConscript before generating MDK5 project file.
 
 ## 3. Program firmware
 ### Step 1:

+ 3 - 3
bsp/nuvoton/numaker-m2354/rtconfig.py

@@ -15,7 +15,7 @@ if  CROSS_TOOL == 'gcc':
 	PLATFORM 	= 'gcc'
 	EXEC_PATH 	= r'C:\Program Files (x86)\GNU Tools ARM Embedded\6 2017-q1-update\bin'
 elif CROSS_TOOL == 'keil':
-	PLATFORM 	= 'armcc'
+	PLATFORM 	= 'armclang'
 	EXEC_PATH 	= r'C:\Keil_v5'
 elif CROSS_TOOL == 'iar':
 	PLATFORM 	= 'iar'
@@ -56,9 +56,9 @@ if PLATFORM == 'gcc':
 
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
-elif PLATFORM == 'armcc':
+elif PLATFORM == 'armclang':
     # toolchains
-    CC = 'armcc'
+    CC = 'armclang'
     AS = 'armasm'
     AR = 'armar'
     LINK = 'armlink'

+ 2 - 0
libcpu/arm/cortex-m23/SConscript

@@ -10,6 +10,8 @@ CPPPATH = [cwd]
 
 if rtconfig.PLATFORM == 'armcc':
     src += Glob('*_rvds.S')
+elif rtconfig.PLATFORM == 'armclang':
+    src += Glob('*_rvds.S')
 
 if rtconfig.PLATFORM == 'gcc':
     src += Glob('*_init.S')