1.更改armcc编译器为armclang 2.修改sconstruct代码为通用模式 3.删除SPI flash 在使用DFS时自动挂载逻辑

3 files changed, 5 insertions, 16 deletions

diff --git a/bsp/gd32/arm/gd32470z-lckfb/SConstruct b/bsp/gd32/arm/gd32470z-lckfb/SConstruct
index 310bd17625..6d8f841770 100644
--- a/bsp/gd32/arm/gd32470z-lckfb/SConstruct
+++ b/bsp/gd32/arm/gd32470z-lckfb/SConstruct
@@ -57,7 +57,7 @@ objs.extend(SConscript(os.path.join(libraries_path_prefix, gd32_library, 'SConsc
 objs.extend(SConscript(os.path.join(libraries_path_prefix, 'gd32_drivers', 'SConscript')))
 
 # include lcd and drivers 
-objs.extend(SConscript(os.path.join(RTT_ROOT, 'bsp', 'gd32', 'arm', 'gd32470z-lckfb', 'board', 'ports', 'SConscript')))
+objs.extend(SConscript(os.path.join(SDK_ROOT, 'board', 'ports', 'SConscript')))
 
 # make a building
 DoBuilding(TARGET, objs)
diff --git a/bsp/gd32/arm/gd32470z-lckfb/rtconfig.py b/bsp/gd32/arm/gd32470z-lckfb/rtconfig.py
index 81ad46ee79..533d12110e 100644
--- a/bsp/gd32/arm/gd32470z-lckfb/rtconfig.py
+++ b/bsp/gd32/arm/gd32470z-lckfb/rtconfig.py
@@ -19,7 +19,7 @@ if  CROSS_TOOL == 'gcc':
     PLATFORM    = 'gcc'
     EXEC_PATH   = r'C:\Users\XXYYZZ'
 elif CROSS_TOOL == 'keil':
-    PLATFORM    = 'armcc'
+    PLATFORM    = 'armclang'
     EXEC_PATH   = r'C:/Keil_v5'
 elif CROSS_TOOL == 'iar':
     PLATFORM = 'iccarm'
@@ -61,10 +61,10 @@ if PLATFORM == 'gcc':
 
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
-elif PLATFORM == 'armcc':
+elif PLATFORM == 'armclang':
     # toolchains
-    CC = 'armcc'
-    CXX = 'armcc'
+    CC = 'armclang'
+    CXX = 'armclang'
     AS = 'armasm'
     AR = 'armar'
     LINK = 'armlink'
diff --git a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
index c3ba5ada74..b61d42f0f4 100644
--- a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
+++ b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
@@ -103,17 +103,6 @@ static int spi_flash_init(void)
             continue;
         }
 #endif
-
-#ifdef RT_USING_DFS
-        if (dfs_mount(cfg->flash_name, "/", "elm", 0, 0) == RT_EOK)
-        {
-            rt_kprintf("SPI flash %s mount success!\n", cfg->flash_name);
-        }
-        else
-        {
-            rt_kprintf("SPI flash %s mount failed!\n", cfg->flash_name);
-        }
-#endif
     }
 
     return result;