Skip to content

Commit bc28df8

Browse files
authored
Merge pull request #20 from RT-Thread/master
pr
2 parents c21f018 + aaf4696 commit bc28df8

File tree

21 files changed

+537
-156
lines changed

21 files changed

+537
-156
lines changed

bsp/efm32/rtconfig.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
#endif
212212

213213
/* SECTION: Runtime library */
214-
// #define RT_USING_NOLIBC
215214
// #define RT_USING_NEWLIB
216215
#define RT_LIBC_USING_TIME
217216

bsp/imxrt/libraries/MIMXRT1050/SConscript

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ if GetDepend(['BSP_USING_HWTIMER']) or GetDepend(['BSP_USING_PWM']):
3434

3535
if GetDepend(['BSP_USING_PWM']):
3636
src += ['MIMXRT1052/drivers/fsl_pwm.c']
37+
src += ['MIMXRT1052/drivers/fsl_qtmr.c']
3738

3839
if GetDepend(['BSP_USING_RTC']):
3940
src += ['MIMXRT1052/drivers/fsl_snvs_hp.c']
@@ -52,9 +53,6 @@ if GetDepend(['BSP_USING_SDRAM']):
5253
if GetDepend(['BSP_USING_LCD']):
5354
src += ['MIMXRT1052/drivers/fsl_elcdif.c']
5455

55-
if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']):
56-
src += ['MIMXRT1052/drivers/fsl_usdhc.c']
57-
5856
if GetDepend(['BSP_USING_CAN']):
5957
src += ['MIMXRT1052/drivers/fsl_flexcan.c']
6058

@@ -78,6 +76,9 @@ if GetDepend(['BSP_USING_DMA']):
7876
src += ['MIMXRT1052/drivers/fsl_lpspi_edma.c']
7977

8078

81-
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
79+
if rtconfig.CROSS_TOOL == 'gcc':
80+
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS')
81+
else:
82+
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
8283

8384
Return('group')

bsp/imxrt/libraries/MIMXRT1064/SConscript

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ if GetDepend(['BSP_USING_ADC']):
4949
if GetDepend(['BSP_USING_SDRAM']):
5050
src += ['MIMXRT1064/drivers/fsl_semc.c']
5151

52-
if GetDepend(['RT_USING_USB_HOST']) or GetDepend(['RT_USING_USB_DEVICE']):
53-
src += ['MIMXRT1064/drivers/fsl_usdhc.c']
54-
5552
if GetDepend(['RT_USING_CAN']):
5653
src += ['MIMXRT1064/drivers/fsl_flexcan.c']
5754

@@ -77,6 +74,9 @@ if GetDepend(['RT_SERIAL_USING_DMA']):
7774
src += ['MIMXRT1064/drivers/fsl_lpuart_edma.c']
7875
src += ['MIMXRT1064/drivers/fsl_lpspi_edma.c']
7976

80-
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
77+
if rtconfig.CROSS_TOOL == 'gcc':
78+
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS')
79+
else:
80+
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)
8181

8282
Return('group')

0 commit comments

Comments
 (0)