Skip to content

Commit 08a9887

Browse files
HubertXieHubertXie
authored
Merge pull request #3 from RT-Thread/master
sync
2 parents 25cdd8b + b57e075 commit 08a9887

File tree

517 files changed

+141779
-13379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

517 files changed

+141779
-13379
lines changed

‎.travis.yml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,29 @@ env:
2525
- RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'
2626
- RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'
2727
- RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'
28-
- RTT_BSP='imxrt/imxrt1050-evk' RTT_TOOL_CHAIN='sourcery-arm'
2928
# - RTT_BSP='avr32uc3b0' RTT_TOOL_CHAIN='atmel-avr32'
3029
# - RTT_BSP='bf533' # no scons
31-
- RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'
30+
- RTT_BSP='efm32' RTT_TOOL_CHAIN='sourcery-arm'
31+
# - RTT_BSP='es32f0334' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
32+
# - RTT_BSP='es32f0654' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
3233
- RTT_BSP='gd32e230k-start' RTT_TOOL_CHAIN='sourcery-arm'
33-
# - RTT_BSP='gd32450z-eval' RTT_TOOL_CHAIN='sourcery-arm'
34+
- RTT_BSP='gd32303e-eval' RTT_TOOL_CHAIN='sourcery-arm'
35+
- RTT_BSP='gd32450z-eval' RTT_TOOL_CHAIN='sourcery-arm'
3436
- RTT_BSP='gkipc' RTT_TOOL_CHAIN='sourcery-arm'
37+
- RTT_BSP='imxrt/imxrt1050-evk' RTT_TOOL_CHAIN='sourcery-arm'
3538
- RTT_BSP='lm3s8962' RTT_TOOL_CHAIN='sourcery-arm'
3639
- RTT_BSP='lm3s9b9x' RTT_TOOL_CHAIN='sourcery-arm'
3740
- RTT_BSP='lm4f232' RTT_TOOL_CHAIN='sourcery-arm'
3841
- RTT_BSP='tm4c129x' RTT_TOOL_CHAIN='sourcery-arm'
42+
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
3943
- RTT_BSP='lpc176x' RTT_TOOL_CHAIN='sourcery-arm'
4044
- RTT_BSP='lpc178x' RTT_TOOL_CHAIN='sourcery-arm'
45+
- RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
46+
# - RTT_BSP='lpc824' RTT_TOOL_CHAIN='sourcery-arm' # not support gcc
4147
- RTT_BSP='lpc2148' RTT_TOOL_CHAIN='sourcery-arm'
4248
- RTT_BSP='lpc2478' RTT_TOOL_CHAIN='sourcery-arm'
43-
- RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
44-
- RTT_BSP='lpc43xx/M4' RTT_TOOL_CHAIN='sourcery-arm'
45-
- RTT_BSP='lpc408x' RTT_TOOL_CHAIN='sourcery-arm'
4649
- RTT_BSP='lpc5410x' RTT_TOOL_CHAIN='sourcery-arm'
50+
- RTT_BSP='lpc54114-lite' RTT_TOOL_CHAIN='sourcery-arm'
4751
# - RTT_BSP='lpc54608-LPCXpresso' RTT_TOOL_CHAIN='sourcery-arm'
4852
- RTT_BSP='ls1bdev' RTT_TOOL_CHAIN='sourcery-mips'
4953
- RTT_BSP='ls1cdev' RTT_TOOL_CHAIN='sourcery-mips'
@@ -56,6 +60,7 @@ env:
5660
# - RTT_BSP='microblaze' # no scons
5761
- RTT_BSP='mini2440' RTT_TOOL_CHAIN='sourcery-arm'
5862
# - RTT_BSP='mini4020' # no scons
63+
- RTT_BSP='mm32l07x'
5964
# - RTT_BSP='nios_ii' # no scons
6065
- RTT_BSP='nuvoton_nuc472' RTT_TOOL_CHAIN='sourcery-arm'
6166
- RTT_BSP='nuvoton_m05x' RTT_TOOL_CHAIN='sourcery-arm'
@@ -64,20 +69,16 @@ env:
6469
- RTT_BSP='qemu-vexpress-gemini' RTT_TOOL_CHAIN='sourcery-arm'
6570
- RTT_BSP='sam7x' RTT_TOOL_CHAIN='sourcery-arm'
6671
# - RTT_BSP='simulator' # x86
67-
- RTT_BSP='stm32f10x' RTT_TOOL_CHAIN='sourcery-arm'
68-
- RTT_BSP='stm32f10x-HAL' RTT_TOOL_CHAIN='sourcery-arm'
69-
- RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'
70-
- RTT_BSP='stm32f4xx-HAL' RTT_TOOL_CHAIN='sourcery-arm'
71-
- RTT_BSP='stm32f429-apollo' RTT_TOOL_CHAIN='sourcery-arm'
72-
- RTT_BSP='stm32f429-disco' RTT_TOOL_CHAIN='sourcery-arm'
73-
- RTT_BSP='stm32h743-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
7472
- RTT_BSP='stm32/stm32f091-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
7573
- RTT_BSP='stm32/stm32f103-atk-nano' RTT_TOOL_CHAIN='sourcery-arm'
7674
- RTT_BSP='stm32/stm32f103-atk-warshipv3' RTT_TOOL_CHAIN='sourcery-arm'
7775
- RTT_BSP='stm32/stm32f103-dofly-lyc8' RTT_TOOL_CHAIN='sourcery-arm'
76+
- RTT_BSP='stm32/stm32f103-dofly-M3S' RTT_TOOL_CHAIN='sourcery-arm'
7877
- RTT_BSP='stm32/stm32f103-fire-arbitrary' RTT_TOOL_CHAIN='sourcery-arm'
7978
- RTT_BSP='stm32/stm32f103-hw100k-ibox' RTT_TOOL_CHAIN='sourcery-arm'
79+
- RTT_BSP='stm32/stm32f103-mini-system' RTT_TOOL_CHAIN='sourcery-arm'
8080
- RTT_BSP='stm32/stm32f107-uc-eval' RTT_TOOL_CHAIN='sourcery-arm'
81+
- RTT_BSP='stm32/stm32f401-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
8182
- RTT_BSP='stm32/stm32f405-smdz-breadfruit' RTT_TOOL_CHAIN='sourcery-arm'
8283
- RTT_BSP='stm32/stm32f407-atk-explorer' RTT_TOOL_CHAIN='sourcery-arm'
8384
- RTT_BSP='stm32/stm32f407-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
@@ -86,16 +87,27 @@ env:
8687
- RTT_BSP='stm32/stm32f429-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
8788
- RTT_BSP='stm32/stm32f429-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
8889
- RTT_BSP='stm32/stm32f446-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
90+
- RTT_BSP='stm32/stm32f469-st-disco' RTT_TOOL_CHAIN='sourcery-arm'
8991
- RTT_BSP='stm32/stm32f746-st-disco' RTT_TOOL_CHAIN='sourcery-arm'
9092
- RTT_BSP='stm32/stm32f767-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
9193
- RTT_BSP='stm32/stm32f767-fire-challenger' RTT_TOOL_CHAIN='sourcery-arm'
9294
- RTT_BSP='stm32/stm32f767-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
9395
- RTT_BSP='stm32/stm32g071-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
96+
- RTT_BSP='stm32/stm32h743-atk-apollo' RTT_TOOL_CHAIN='sourcery-arm'
97+
- RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'
9498
- RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
9599
- RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
96100
- RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'
101+
- RTT_BSP='stm32/stm32l475-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'
97102
- RTT_BSP='stm32/stm32l476-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
98103
- RTT_BSP='stm32/stm32l496-ali-developer' RTT_TOOL_CHAIN='sourcery-arm'
104+
- RTT_BSP='stm32f4xx-HAL' RTT_TOOL_CHAIN='sourcery-arm'
105+
- RTT_BSP='stm32f10x' RTT_TOOL_CHAIN='sourcery-arm'
106+
- RTT_BSP='stm32f10x-HAL' RTT_TOOL_CHAIN='sourcery-arm'
107+
- RTT_BSP='stm32f20x' RTT_TOOL_CHAIN='sourcery-arm'
108+
- RTT_BSP='stm32f429-apollo' RTT_TOOL_CHAIN='sourcery-arm'
109+
- RTT_BSP='stm32f429-disco' RTT_TOOL_CHAIN='sourcery-arm'
110+
- RTT_BSP='stm32h743-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
99111
- RTT_BSP='swm320-lq100' RTT_TOOL_CHAIN='sourcery-arm'
100112
# - RTT_BSP='taihu' RTT_TOOL_CHAIN='sourcery-ppc'
101113
# - RTT_BSP='upd70f3454' # iar
@@ -105,6 +117,7 @@ env:
105117
- RTT_BSP='frdm-k64f' RTT_TOOL_CHAIN='sourcery-arm'
106118
- RTT_BSP='fh8620' RTT_TOOL_CHAIN='sourcery-arm'
107119
- RTT_BSP='x1000' RTT_TOOL_CHAIN='sourcery-mips'
120+
- RTT_BSP='xplorer4330/M4' RTT_TOOL_CHAIN='sourcery-arm'
108121

109122
stage: compile
110123
script:

‎bsp/allwinner_tina/drivers/drv_gpio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "drv_gpio.h"
2828
#include "interrupt.h"
2929

30-
#define DBG_SECTION_NAME "GPIO"
31-
#define DBG_LEVEL DBG_WARNING
30+
#define DBG_TAG "GPIO"
31+
#define DBG_LVL DBG_WARNING
3232
#include <rtdbg.h>
3333

3434
#define readl(addr) (*(volatile unsigned int *)(addr))

‎bsp/allwinner_tina/drivers/drv_sdio.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
#include "drv_clock.h"
3434

3535

36-
#define DBG_SECTION_NAME "MMC"
37-
// #define DBG_LEVEL DBG_LOG
38-
// #define DBG_LEVEL DBG_INFO
39-
#define DBG_LEVEL DBG_WARNING
40-
// #define DBG_LEVEL DBG_ERROR
36+
#define DBG_TAG "MMC"
37+
// #define DBG_LVL DBG_LOG
38+
// #define DBG_LVL DBG_INFO
39+
#define DBG_LVL DBG_WARNING
40+
// #define DBG_LVL DBG_ERROR
4141
#include <rtdbg.h>
4242

4343
#ifdef RT_USING_SDIO

‎bsp/allwinner_tina/drivers/spi/drv_spi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535

3636
//#define DEBUG
3737

38-
#define DBG_SECTION_NAME "SPI"
38+
#define DBG_TAG "SPI"
3939
#ifdef DEBUG
40-
#define DBG_LEVEL DBG_LOG
40+
#define DBG_LVL DBG_LOG
4141
#else
42-
#define DBG_LEVEL DBG_WARNING
42+
#define DBG_LVL DBG_WARNING
4343
#endif /* DEBUG */
4444
#include <rtdbg.h>
4545

‎bsp/allwinner_tina/drivers/spi/drv_spi_flash.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <rthw.h>
2727
#include <rtdevice.h>
2828

29-
#define DBG_SECTION_NAME "FLASH"
30-
#define DBG_LEVEL DBG_LOG
29+
#define DBG_TAG "FLASH"
30+
#define DBG_LVL DBG_LOG
3131
#include <rtdbg.h>
3232

3333
#define SPI_FLASH_DEVICE_NAME "spi00"

‎bsp/amebaz/drivers/wlan/drv_wifi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "drv_wlan.h"
2929
#include "drv_wifi.h"
3030

31-
#define DBG_LEVEL DBG_INFO
32-
#define DBG_SECTION_NAME "WIFI"
31+
#define DBG_LVL DBG_INFO
32+
#define DBG_TAG "WIFI"
3333
#include <rtdbg.h>
3434

3535
#define MAX_ADDR_LEN (6)

‎bsp/es32f0334/.config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,16 @@ CONFIG_BSP_USING_UART1=y
357357
#
358358
# CONFIG_BSP_USING_RTC is not set
359359

360+
#
361+
# PM Drivers
362+
#
363+
# CONFIG_BSP_USING_PM is not set
364+
365+
#
366+
# ADC Drivers
367+
#
368+
# CONFIG_BSP_USING_ADC is not set
369+
360370
#
361371
# Onboard Peripheral Drivers
362372
#

‎bsp/es32f0334/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ ES-PDS-ES32F0334-V1.1
4444
| PWM | 支持 | PWM0/1/2/3 |
4545
| TIMER | 支持 | TIMER0/1/2/3 |
4646
| RTC | 支持 | RTC |
47+
| PM | 支持 | Power Management |
48+
| ADC | 支持 | ADC0 |
4749

4850
更多详细信息请咨询[上海东软载波微电子技术支持](http://www.essemi.com/)
4951

‎bsp/es32f0334/drivers/Kconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,20 @@ menu "Hardware Drivers Config"
9595
default n
9696
endmenu
9797

98+
menu "PM Drivers"
99+
config BSP_USING_PM
100+
bool "Using PM"
101+
select RT_USING_PM
102+
default n
103+
endmenu
104+
105+
menu "ADC Drivers"
106+
config BSP_USING_ADC
107+
bool "Using ADC"
108+
select RT_USING_ADC
109+
default n
110+
endmenu
111+
98112
endmenu
99113

100114
menu "Onboard Peripheral Drivers"

‎bsp/es32f0334/drivers/SConscript

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ if GetDepend('BSP_USING_HWTIMER0') or GetDepend('BSP_USING_HWTIMER1') or GetDepe
3939
if GetDepend(['BSP_USING_RTC']):
4040
src += ['drv_rtc.c']
4141

42+
# add pm driver code
43+
if GetDepend(['BSP_USING_PM']):
44+
src += ['drv_pm.c']
45+
46+
# add adc driver code
47+
if GetDepend(['BSP_USING_ADC']):
48+
src += ['drv_adc.c']
49+
4250
CPPPATH = [cwd]
4351
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
4452

0 commit comments

Comments
 (0)