[bsp/stm32f407-spark1] add llvm-arm toolchain support.

3 files changed, 41 insertions, 5 deletions

diff --git a/bsp/stm32/stm32f407-rt-spark/board/SConscript b/bsp/stm32/stm32f407-rt-spark/board/SConscript
index e815c92613..dcffdb097e 100644
--- a/bsp/stm32/stm32f407-rt-spark/board/SConscript
+++ b/bsp/stm32/stm32f407-rt-spark/board/SConscript
@@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc']
 
 startup_path_prefix = SDK_LIB
 
-if rtconfig.PLATFORM in ['gcc']:
+if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
     src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s']
diff --git a/bsp/stm32/stm32f407-rt-spark/board/linker_scripts/link.lds b/bsp/stm32/stm32f407-rt-spark/board/linker_scripts/link.lds
index bb5b18bfb6..2d48a9e347 100644
--- a/bsp/stm32/stm32f407-rt-spark/board/linker_scripts/link.lds
+++ b/bsp/stm32/stm32f407-rt-spark/board/linker_scripts/link.lds
@@ -10,7 +10,7 @@ MEMORY
     CODE (rx) : ORIGIN = 0x08000000, LENGTH = 1024k /* 1024KB flash */
     RAM1 (rw) : ORIGIN = 0x20000000, LENGTH =  128k /* 128K sram */
     RAM2 (rw) : ORIGIN = 0x10000000, LENGTH =   64k /* 64K sram */
-    MCUlcdgrambysram (rw) : ORIGIN =0x68000000, LENGTH = 1024k
+    MCUlcdgrambysram (rw) : ORIGIN = 0x68000000, LENGTH = 1024k
 }
 ENTRY(Reset_Handler)
 _system_stack_size = 0x400;
@@ -64,6 +64,8 @@ SECTIONS
 
         . = ALIGN(4);
 
+        KEEP(*(.eh_frame*))
+        . = ALIGN(4);
         _etext = .;
     } > CODE = 0
 
diff --git a/bsp/stm32/stm32f407-rt-spark/rtconfig.py b/bsp/stm32/stm32f407-rt-spark/rtconfig.py
index 5e5bc02064..b7f864fbac 100644
--- a/bsp/stm32/stm32f407-rt-spark/rtconfig.py
+++ b/bsp/stm32/stm32f407-rt-spark/rtconfig.py
@@ -24,11 +24,14 @@ elif CROSS_TOOL == 'keil':
 elif CROSS_TOOL == 'iar':
     PLATFORM    = 'iccarm'
     EXEC_PATH   = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
+elif CROSS_TOOL == 'llvm-arm':
+    PLATFORM    = 'llvm-arm'
+    EXEC_PATH   = r'D:\Progrem\LLVMEmbeddedToolchainForArm-17.0.1-Windows-x86_64\bin'
 
 if os.getenv('RTT_EXEC_PATH'):
     EXEC_PATH = os.getenv('RTT_EXEC_PATH')
 
-BUILD = 'debug'
+BUILD = 'release'
 
 if PLATFORM == 'gcc':
     # toolchains
@@ -55,11 +58,12 @@ if PLATFORM == 'gcc':
         CFLAGS += ' -O0 -gdwarf-2 -g'
         AFLAGS += ' -gdwarf-2'
     else:
-        CFLAGS += ' -O2'
+        CFLAGS += ' -Os'
 
     CXXFLAGS = CFLAGS 
 
-    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O ihex $TARGET rtthread.hex\n' + SIZE + ' $TARGET \n'
+    POST_ACTION += OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
@@ -175,6 +179,36 @@ elif PLATFORM == 'iccarm':
     
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
     POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'
+elif PLATFORM == 'llvm-arm':
+    # toolchains
+    PREFIX = 'llvm-'
+    CC = 'clang'
+    AS = 'clang'
+    AR = PREFIX + 'ar'
+    CXX = 'clang++'
+    LINK = 'clang'
+    TARGET_EXT = 'elf'
+    SIZE = PREFIX + 'size'
+    OBJDUMP = PREFIX + 'objdump'
+    OBJCPY = PREFIX + 'objcopy'
+    DEVICE = ' --target=arm-none-eabihf -mfloat-abi=hard -march=armv7em -mfpu=fpv4-sp-d16'
+    DEVICE += ' -ffunction-sections -fdata-sections -fno-exceptions -fno-rtti'
+    CFLAGS = DEVICE
+    AFLAGS = ' -c' + DEVICE + ' -Wa,-mimplicit-it=thumb ' ## -x assembler-with-cpp
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rt-thread.map,-u,Reset_Handler -lcrt0 -T board/linker_scripts/link.lds'
+
+    CPATH = ''
+    LPATH = ''
+
+    if BUILD == 'debug':
+        CFLAGS += ' -O0 -gdwarf-2 -g'
+        AFLAGS += ' -gdwarf-2'
+    else:
+        CFLAGS += ' -O3'
+
+    CXXFLAGS = CFLAGS 
+
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 def dist_handle(BSP_ROOT, dist_dir):
     import sys