From c692e194a6a261b571b14328f3c1bc7ad44ff56b Mon Sep 17 00:00:00 2001
From: SummerGift <SummerGift@qq.com>
Date: Thu, 13 Dec 2018 15:13:30 +0800
Subject: [PATCH] [bsp][stm32]  optimize board/SConscript code

---
 bsp/stm32/libraries/templates/stm32f10x/board/SConscript | 6 ++++--
 bsp/stm32/libraries/templates/stm32f4xx/board/SConscript | 6 ++++--
 bsp/stm32/libraries/templates/stm32l4xx/board/SConscript | 6 ++++--
 bsp/stm32/stm32f103-atk-nano/board/SConscript            | 6 ++++--
 bsp/stm32/stm32f103-fire-arbitrary/board/SConscript      | 6 ++++--
 bsp/stm32/stm32f407-atk-explorer/board/SConscript        | 6 ++++--
 bsp/stm32/stm32f429-atk-apollo/board/SConscript          | 6 ++++--
 bsp/stm32/stm32f429-fire-challenger/board/SConscript     | 6 ++++--
 8 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript
index 2220836b6..a88ecd435 100644
--- a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f1xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f1xx_hal_msp.c
+''')
 
 path =  [cwd]
 path += [cwd + '/CubeMX_Config/Inc']
diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript
index 4a2bfc231..c62947164 100644
--- a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript
+++ b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f4xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f4xx_hal_msp.c
+''')
 
 path =  [cwd]
 path += [cwd + '/CubeMX_Config/Inc']
diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript
index 0266cdaa2..e826c7212 100644
--- a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript
+++ b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32l4xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32l4xx_hal_msp.c
+''')
 
 path =  [cwd]
 path += [cwd + '/CubeMX_Config/Inc']
diff --git a/bsp/stm32/stm32f103-atk-nano/board/SConscript b/bsp/stm32/stm32f103-atk-nano/board/SConscript
index 2403d7fb3..9659e84a2 100644
--- a/bsp/stm32/stm32f103-atk-nano/board/SConscript
+++ b/bsp/stm32/stm32f103-atk-nano/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f1xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f1xx_hal_msp.c
+''')
 
 if GetDepend(['BSP_USING_SPI_FLASH']):
     src += Glob('ports/spi_flash_init.c')
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript
index f26304c6d..24b0a3b97 100644
--- a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript
+++ b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f1xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f1xx_hal_msp.c
+''')
 
 if GetDepend(['BSP_USING_ETH']):
     src += Glob('ports/w5500_device.c')
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/SConscript b/bsp/stm32/stm32f407-atk-explorer/board/SConscript
index cb20cf76e..ee12fe4ce 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/SConscript
+++ b/bsp/stm32/stm32f407-atk-explorer/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f4xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f4xx_hal_msp.c
+''')
 
 if GetDepend(['BSP_USING_ETH']):
     src += Glob('ports/phy_reset.c')
diff --git a/bsp/stm32/stm32f429-atk-apollo/board/SConscript b/bsp/stm32/stm32f429-atk-apollo/board/SConscript
index 2cf3a648d..e67a62e1e 100644
--- a/bsp/stm32/stm32f429-atk-apollo/board/SConscript
+++ b/bsp/stm32/stm32f429-atk-apollo/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f4xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f4xx_hal_msp.c
+''')
 
 if GetDepend(['BSP_USING_ETH']):
     src += Glob('ports/phy_reset.c')
diff --git a/bsp/stm32/stm32f429-fire-challenger/board/SConscript b/bsp/stm32/stm32f429-fire-challenger/board/SConscript
index c633cff75..7345e4e19 100644
--- a/bsp/stm32/stm32f429-fire-challenger/board/SConscript
+++ b/bsp/stm32/stm32f429-fire-challenger/board/SConscript
@@ -7,8 +7,10 @@ Import('SDK_LIB')
 cwd = GetCurrentDir()
 
 # add general drivers
-src =  Glob('board.c')
-src += Glob('CubeMX_Config/Src/stm32f4xx_hal_msp.c')
+src = Split('''
+board.c
+CubeMX_Config/Src/stm32f4xx_hal_msp.c
+''')
 
 if GetDepend(['BSP_USING_ETH']):
     src += Glob('ports/phy_reset.c')
-- 
GitLab