Merge pull request #2892 from yangjie11/dev_cut_fix

[bsp][stm32/libraries]修复在关闭GPIO device drivers时的报错

9 files changed, 13 insertions, 29 deletions

diff --git a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript
index 62cb014ce8..0149cd46f2 100644
--- a/bsp/stm32/libraries/STM32F0xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32F0xx_HAL/SConscript
@@ -23,11 +23,9 @@ STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c
 STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_pwr.c
 STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c
 STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c
+STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.c
 """)
 
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.c']
-
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_uart.c']
     src += ['STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_uart_ex.c']
diff --git a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript
index b021f0c806..403698f9f8 100644
--- a/bsp/stm32/libraries/STM32F1xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32F1xx_HAL/SConscript
@@ -17,10 +17,10 @@ STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c
 STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
 STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c
 STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c
+STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
 """)
 
 if GetDepend(['RT_USING_PIN']):
-    src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c']
     src += ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c']
     
 if GetDepend(['RT_USING_SERIAL']):
diff --git a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript
index fc55e6b0cf..2f5f37d31c 100644
--- a/bsp/stm32/libraries/STM32F2xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32F2xx_HAL/SConscript
@@ -15,10 +15,8 @@ STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc.c
 STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_rcc_ex.c
 STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c
 STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_sram.c
+STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c
 """)
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_gpio.c']
     
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_uart.c']
diff --git a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript
index bed0194fa8..714d49ba02 100644
--- a/bsp/stm32/libraries/STM32F4xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32F4xx_HAL/SConscript
@@ -21,10 +21,8 @@ STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c
 STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c
 STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c
 STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c
+STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c
 ''')
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c']
     
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c']
diff --git a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript
index 7ac6e8d01b..28f9640a9a 100644
--- a/bsp/stm32/libraries/STM32F7xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32F7xx_HAL/SConscript
@@ -23,11 +23,9 @@ STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_rcc.c
 STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_rcc_ex.c
 STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_rng.c
 STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_sram.c
+STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_gpio.c
 ''')
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_gpio.c']
-    
+ 
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_uart.c']
     src += ['STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_uart_ex.c']
diff --git a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript
index aa9dd911bc..53c05b7160 100644
--- a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript
@@ -18,11 +18,9 @@ STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr.c
 STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.c
 STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.c
 STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.c
+STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.c
 """)
 
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.c']
-
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.c']
     src += ['STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.c']
diff --git a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
index 6ae0aaca4d..aacf24b3fe 100644
--- a/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32H7xx_HAL/SConscript
@@ -25,11 +25,9 @@ STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rcc.c
 STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rcc_ex.c
 STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rng.c
 STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sram.c
+STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_gpio.c
 ''')
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_gpio.c']
-    
+ 
 if GetDepend(['RT_USING_SERIAL']):
 	src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_uart.c']
 	src += ['STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_usart.c']
diff --git a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript
index dc08502212..84d5daca28 100644
--- a/bsp/stm32/libraries/STM32L0xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32L0xx_HAL/SConscript
@@ -21,11 +21,9 @@ STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_pwr_ex.c
 STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc.c
 STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c
 STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rng.c
+STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_gpio.c
 ''')
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_gpio.c']
-    
+ 
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart.c']
     src += ['STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart_ex.c']
diff --git a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript
index 5eb48c406c..037f91893e 100644
--- a/bsp/stm32/libraries/STM32L4xx_HAL/SConscript
+++ b/bsp/stm32/libraries/STM32L4xx_HAL/SConscript
@@ -23,11 +23,9 @@ STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_pwr_ex.c
 STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc.c
 STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rcc_ex.c
 STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_rng.c
+STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c
 ''')
-
-if GetDepend(['RT_USING_PIN']):
-    src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_gpio.c']
-    
+  
 if GetDepend(['RT_USING_SERIAL']):
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart.c']
     src += ['STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_uart_ex.c']