diff options
| author | Bernard Xiong <[email protected]> | 2021-05-13 20:51:34 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-13 20:51:34 +0800 |
| commit | 484cda4d928592bb575f2914dceb84caf4c09d4e (patch) | |
| tree | 843f08596a080bc881ec1958a0faccc57ff51dae | |
| parent | bfd836e44cce051a3f300b8a7f92d95cabfd8e06 (diff) | |
| parent | 0da2fb5f9b8ceaec84e51f31b23aeee2107f42b5 (diff) | |
Merge pull request #4676 from OpenNuvoton/miss_rvds_s_armclang
[libcpu][arm][cortex-m23]Correct rvds.S including for armclang platform.
| -rw-r--r-- | bsp/nuvoton/numaker-m2354/README.md | 1 | ||||
| -rw-r--r-- | bsp/nuvoton/numaker-m2354/rtconfig.py | 6 | ||||
| -rw-r--r-- | libcpu/arm/cortex-m23/SConscript | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bsp/nuvoton/numaker-m2354/README.md b/bsp/nuvoton/numaker-m2354/README.md index 5cc0d34fb8..de4e03ad01 100644 --- a/bsp/nuvoton/numaker-m2354/README.md +++ b/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: diff --git a/bsp/nuvoton/numaker-m2354/rtconfig.py b/bsp/nuvoton/numaker-m2354/rtconfig.py index aba7250bc3..2a59f1a4f0 100644 --- a/bsp/nuvoton/numaker-m2354/rtconfig.py +++ b/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' diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index 28af7ba651..a4535c03ea 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/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') |