[synwit] add variant_dir for libraries building

4 files changed, 12 insertions, 11 deletions

diff --git a/bsp/synwit/swm320-mini/SConstruct b/bsp/synwit/swm320-mini/SConstruct
index 6ae0391615..f771d5960d 100644
--- a/bsp/synwit/swm320-mini/SConstruct
+++ b/bsp/synwit/swm320-mini/SConstruct
@@ -40,10 +40,10 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 libraries_path = os.path.join(GetCurrentDir(), '..', 'libraries')
 
 # include libraries
-objs += SConscript(os.path.join(libraries_path, 'SWM320_CSL', 'SConscript'))
+objs += SConscript(os.path.join(libraries_path, 'SWM320_CSL', 'SConscript'), variant_dir='build/libraries/SWM320_CSL', duplicate=0)
 
 # include drivers
-objs += SConscript(os.path.join(libraries_path, 'SWM320_drivers', 'SConscript'))
+objs += SConscript(os.path.join(libraries_path, 'SWM320_drivers', 'SConscript'), variant_dir='build/libraries/SWM320_drivers', duplicate=0)
 
 # make a building
 DoBuilding(TARGET, objs)
diff --git a/bsp/synwit/swm320-mini/rtconfig.py b/bsp/synwit/swm320-mini/rtconfig.py
index 5ef08bb766..75a2468c13 100644
--- a/bsp/synwit/swm320-mini/rtconfig.py
+++ b/bsp/synwit/swm320-mini/rtconfig.py
@@ -39,8 +39,9 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
 
     TARGET_EXT = 'elf'
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -ffunction-sections -fdata-sections'
-    CFLAGS = DEVICE + ' -g -Wall'
+
+    DEVICE = ' -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections'
+    CFLAGS = DEVICE + ' -Dgcc'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb '
     LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'
 
diff --git a/bsp/synwit/swm341-mini/SConstruct b/bsp/synwit/swm341-mini/SConstruct
index 56d491b372..bf84b597a2 100644
--- a/bsp/synwit/swm341-mini/SConstruct
+++ b/bsp/synwit/swm341-mini/SConstruct
@@ -40,10 +40,10 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
 libraries_path = os.path.join(GetCurrentDir(), '..', 'libraries')
 
 # include libraries
-objs += SConscript(os.path.join(libraries_path, 'SWM341_CSL', 'SConscript'))
+objs += SConscript(os.path.join(libraries_path, 'SWM341_CSL', 'SConscript'), variant_dir='build/libraries/SWM341_CSL', duplicate=0)
 
 # include drivers
-objs += SConscript(os.path.join(libraries_path, 'SWM341_drivers', 'SConscript'))
+objs += SConscript(os.path.join(libraries_path, 'SWM341_drivers', 'SConscript'), variant_dir='build/libraries/SWM341_drivers', duplicate=0)
 
 
 # make a building
diff --git a/bsp/synwit/swm341-mini/rtconfig.py b/bsp/synwit/swm341-mini/rtconfig.py
index 29b31f21f2..42039720b3 100644
--- a/bsp/synwit/swm341-mini/rtconfig.py
+++ b/bsp/synwit/swm341-mini/rtconfig.py
@@ -3,7 +3,7 @@ import os
 # toolchains options
 ARCH='arm'
 CPU='cortex-m33'
-CROSS_TOOL='keil'
+CROSS_TOOL='gcc'
 
 if os.getenv('RTT_CC'):
     CROSS_TOOL = os.getenv('RTT_CC')
@@ -29,20 +29,20 @@ BUILD = 'debug'
 #BUILD = 'release'
 
 if PLATFORM == 'gcc':
-    # toolchains
     PREFIX = 'arm-none-eabi-'
     CC = PREFIX + 'gcc'
     AS = PREFIX + 'gcc'
     AR = PREFIX + 'ar'
     CXX = PREFIX + 'g++'
     LINK = PREFIX + 'gcc'
-    TARGET_EXT = 'elf'
     SIZE = PREFIX + 'size'
     OBJDUMP = PREFIX + 'objdump'
     OBJCPY = PREFIX + 'objcopy'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
-    CFLAGS = DEVICE + ' -Dgcc -fstack-usage -fdump-rtl-dfinish'
+    TARGET_EXT = 'elf'
+
+    DEVICE = ' -mcpu=cortex-m33 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    CFLAGS = DEVICE + ' -Dgcc'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb -I.'
     LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'