Merge branch 'master' into gitee_master

Author: aozima

bsp/essemi/es8p508x/SConscript

@@ -1,8 +1,9 @@
 # RT-Thread SConscript bridge
 import os
+from building import *
 
 objs = []
-cwd  = GetCurrentDir()
+cwd = GetCurrentDir()
 list = os.listdir(cwd)
 
 for d in list:

bsp/imx6ul/SConstruct

@@ -20,6 +20,7 @@ env = Environment(tools = ['mingw'],
 	AR = rtconfig.AR, ARFLAGS = '-rc',
 	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
+env['ASCOM'] = env['ASPPCOM']
 
 Export('RTT_ROOT')
 Export('rtconfig')

bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py

@@ -53,14 +53,17 @@
     CPATH = ''
     LPATH = ''
 
+    AFLAGS += ' -D__STARTUP_INITIALIZE_NONCACHEDATA'
+    AFLAGS += ' -D__STARTUP_CLEAR_BSS'
+
     if BUILD == 'debug':
         CFLAGS += ' -gdwarf-2'
         AFLAGS += ' -gdwarf-2'
         CFLAGS += ' -O0'
     else:
         CFLAGS += ' -O2 -Os'
 
-    POST_ACTION = OBJCPY + ' -O binary --remove-section=.boot_data --remove-section=.image_vertor_table --remove-section=.ncache $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
     # module setting 
     CXXFLAGS = ' -Woverloaded-virtual -fno-exceptions -fno-rtti '

bsp/imxrt/imxrt1064-nxp-evk/README.md

@@ -71,7 +71,7 @@
 
 ### 快速上手
 
-本 BSP 为开发者提供 MDK4、MDK5 和 IAR 工程，暂不支持 GCC 开发环境。下面以 MDK5 开发环境为例，介绍如何将系统运行起来。
+本 BSP 为开发者提供 MDK4、MDK5 和 IAR 工程，以及GCC 开发环境。下面以 MDK5 开发环境为例，介绍如何将系统运行起来。
 
 #### 硬件连接
 
@@ -115,4 +115,4 @@ msh >
 
 维护人:
 
--  [王强](https://github.com/xfwangqiang), 邮箱：<[email protected]>
+-  [王强](https://github.com/xfwangqiang, https://gitee.com/xfwangqiang), 邮箱：<[email protected]>

bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py

@@ -53,6 +53,9 @@
     CPATH = ''
     LPATH = ''
 
+    AFLAGS += ' -D__STARTUP_INITIALIZE_NONCACHEDATA'
+    AFLAGS += ' -D__STARTUP_CLEAR_BSS'
+
     if BUILD == 'debug':
         CFLAGS += ' -gdwarf-2'
         AFLAGS += ' -gdwarf-2'

bsp/nrf5x/libraries/drivers/SConscript

@@ -19,8 +19,12 @@ if GetDepend(['BSP_USING_QSPI_FLASH']):
 
 if GetDepend(['BSP_USING_SPI']):
     src += ['drv_spi.c']
+    
 if GetDepend(['BSP_USING_GPIO']):
     src += ['drv_gpio.c']
+    
+if GetDepend(['BSP_USING_PWM']):
+    src += ['drv_pwm.c']
 
 path =  [cwd]
 

bsp/nrf5x/libraries/drivers/drv_gpio.c

@@ -46,22 +46,6 @@ static const struct pin_index pins[] =
     __NRF5X_PIN(29,  0, 29),
     __NRF5X_PIN(30,  0, 30),
     __NRF5X_PIN(31,  0, 31),
-    __NRF5X_PIN(32,  1, 0 ),
-    __NRF5X_PIN(33,  1, 1 ),
-    __NRF5X_PIN(34,  1, 2 ),
-    __NRF5X_PIN(35,  1, 3 ),
-    __NRF5X_PIN(36,  1, 4 ),
-    __NRF5X_PIN(37,  1, 5 ),
-    __NRF5X_PIN(38,  1, 6 ),
-    __NRF5X_PIN(39,  1, 7 ),
-    __NRF5X_PIN(40,  1, 8 ),
-    __NRF5X_PIN(41,  1, 9 ),
-    __NRF5X_PIN(42,  1, 10),
-    __NRF5X_PIN(43,  1, 11),
-    __NRF5X_PIN(44,  1, 12),
-    __NRF5X_PIN(45,  1, 13),
-    __NRF5X_PIN(46,  1, 14),
-    __NRF5X_PIN(47,  1, 15),
 };
 
 /* EVENTS_IN[n](n=0..7) and EVENTS_PORT */

bsp/nrf5x/libraries/drivers/drv_gpio.h

@@ -13,7 +13,6 @@
 
 #include <board.h>
 #include <rtdevice.h>
-#include <nrf52840.h>
 #include <hal/nrf_gpio.h>
 #include <drivers/include/nrfx_gpiote.h>