Skip to content

Commit 3ab2d4f

Browse files
author
thread-liu
committed
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into step4-ev1
2 parents a06f1fa + 42088b0 commit 3ab2d4f

File tree

23 files changed

+1285
-915
lines changed

23 files changed

+1285
-915
lines changed

‎.github/workflows/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ on:
2424
jobs:
2525
build:
2626
runs-on: ubuntu-latest
27+
name: ${{ matrix.legs.RTT_BSP }}
2728
strategy:
2829
fail-fast: false
2930
matrix:

‎bsp/ls2kdev/.config‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ CONFIG_RT_USING_MEMPOOL=y
5252
# CONFIG_RT_USING_NOHEAP is not set
5353
CONFIG_RT_USING_SMALL_MEM=y
5454
# CONFIG_RT_USING_SLAB is not set
55+
# CONFIG_RT_USING_USERHEAP is not set
5556
# CONFIG_RT_USING_MEMTRACE is not set
5657
CONFIG_RT_USING_HEAP=y
5758

@@ -150,6 +151,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
150151
# CONFIG_RT_USING_HWTIMER is not set
151152
# CONFIG_RT_USING_CPUTIME is not set
152153
# CONFIG_RT_USING_I2C is not set
154+
# CONFIG_RT_USING_PHY is not set
153155
CONFIG_RT_USING_PIN=y
154156
# CONFIG_RT_USING_ADC is not set
155157
# CONFIG_RT_USING_DAC is not set
@@ -159,7 +161,12 @@ CONFIG_RT_USING_PIN=y
159161
# CONFIG_RT_USING_PM is not set
160162
# CONFIG_RT_USING_RTC is not set
161163
# CONFIG_RT_USING_SDIO is not set
162-
# CONFIG_RT_USING_SPI is not set
164+
CONFIG_RT_USING_SPI=y
165+
# CONFIG_RT_USING_QSPI is not set
166+
# CONFIG_RT_USING_SPI_MSD is not set
167+
# CONFIG_RT_USING_SFUD is not set
168+
# CONFIG_RT_USING_ENC28J60 is not set
169+
# CONFIG_RT_USING_SPI_WIFI is not set
163170
# CONFIG_RT_USING_WDT is not set
164171
# CONFIG_RT_USING_AUDIO is not set
165172
# CONFIG_RT_USING_SENSOR is not set
@@ -183,6 +190,7 @@ CONFIG_RT_USING_LIBC=y
183190
CONFIG_RT_USING_POSIX=y
184191
# CONFIG_RT_USING_POSIX_MMAP is not set
185192
# CONFIG_RT_USING_POSIX_TERMIOS is not set
193+
# CONFIG_RT_USING_POSIX_GETLINE is not set
186194
# CONFIG_RT_USING_POSIX_AIO is not set
187195
# CONFIG_RT_USING_MODULE is not set
188196

@@ -375,6 +383,8 @@ CONFIG_RT_LWIP_USING_PING=y
375383
# CONFIG_PKG_USING_AGILE_TELNET is not set
376384
# CONFIG_PKG_USING_NMEALIB is not set
377385
# CONFIG_PKG_USING_AGILE_JSMN is not set
386+
# CONFIG_PKG_USING_PDULIB is not set
387+
# CONFIG_PKG_USING_BTSTACK is not set
378388

379389
#
380390
# security packages
@@ -453,6 +463,7 @@ CONFIG_PKG_LWEXT4_VER="latest"
453463
# CONFIG_PKG_USING_MININI is not set
454464
# CONFIG_PKG_USING_QBOOT is not set
455465
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
466+
# CONFIG_PKG_USING_PPOOL is not set
456467

457468
#
458469
# peripheral libraries and drivers
@@ -505,6 +516,7 @@ CONFIG_PKG_LWEXT4_VER="latest"
505516
# CONFIG_PKG_USING_AGILE_CONSOLE is not set
506517
# CONFIG_PKG_USING_LD3320 is not set
507518
# CONFIG_PKG_USING_WK2124 is not set
519+
# CONFIG_PKG_USING_LY68L6400 is not set
508520

509521
#
510522
# miscellaneous packages
@@ -542,4 +554,8 @@ CONFIG_PKG_LWEXT4_VER="latest"
542554
# CONFIG_PKG_USING_ULAPACK is not set
543555
# CONFIG_PKG_USING_UKAL is not set
544556
# CONFIG_PKG_USING_CRCLIB is not set
557+
# CONFIG_PKG_USING_THREES is not set
558+
# CONFIG_PKG_USING_2048 is not set
559+
# CONFIG_PKG_USING_LWGPS is not set
560+
# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
545561
CONFIG_SOC_LS2K1000=y

‎bsp/ls2kdev/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ msh >
9797

9898
```
9999
title TFTPBOOT
100-
kernel tftfp://10.1.1.118/rtthread.elf
100+
kernel tftp://10.1.1.118/rtthread.elf
101101
args console=tty root=/dev/sda2
102102
initrd (wd0,0)/initrd.img
103103
```
@@ -114,11 +114,12 @@ title TFTPBOOT
114114

115115
| 驱动 | 支持情况 | 备注 |
116116
| ------ | ---- | :------: |
117-
| UART | 支持 | UART0|
117+
| UART | 支持 | UART0\UART4,波特率可调 |
118118
| GPIO | 支持 | - |
119119
| PWM | 支持 | - |
120120
| GMAC | 支持 | 网卡驱动 |
121121
| RTC | 支持 | - |
122+
| SPI | 支持 | - |
122123

123124
## 6. 联系人信息
124125

@@ -127,4 +128,4 @@ title TFTPBOOT
127128
[1]: http://ftp.loongnix.org/loongsonpi/pi_2/doc
128129
[2]: https://pan.baidu.com/s/17dbdOE4NAJ-qEW7drVRq2w
129130
[3]: http://ftp.loongnix.org/embedd/ls2k/
130-
[4]: https://github.com/BernardXiong
131+
[4]: https://github.com/BernardXiong

‎bsp/ls2kdev/applications/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include <rtthread.h>
1212

13-
int main(int argc, char** argv)
14-
{
13+
int main(int argc, char **argv)
14+
{
1515
rt_kprintf("Hi, this is RT-Thread!!\n");
1616
return 0;
1717
}

‎bsp/ls2kdev/drivers/board.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void rt_hw_timer_handler(void)
6767
*/
6868
void rt_hw_timer_init(void)
6969
{
70-
write_c0_compare(CPU_HZ/2/RT_TICK_PER_SECOND);
70+
write_c0_compare(CPU_HZ / 2 / RT_TICK_PER_SECOND);
7171
write_c0_count(0);
7272
mips_unmask_cpu_irq(7);
7373
}
@@ -90,16 +90,16 @@ void rt_hw_board_init(void)
9090
/* init hardware UART device */
9191
rt_hw_uart_init();
9292
/* set console device */
93-
rt_console_set_device("uart");
93+
rt_console_set_device("uart0");
9494
#endif
9595

9696
#ifdef RT_USING_HEAP
97-
rt_system_heap_init((void*)RT_HW_HEAP_BEGIN, (void*)RT_HW_HEAP_END);
97+
rt_system_heap_init((void *)RT_HW_HEAP_BEGIN, (void *)RT_HW_HEAP_END);
9898
#endif
9999

100100
/* init operating system timer */
101101
rt_hw_timer_init();
102-
102+
103103
#ifdef RT_USING_COMPONENTS_INIT
104104
rt_components_board_init();
105105
#endif

‎bsp/ls2kdev/drivers/clk.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include <rtthread.h>
1515
#include "ls2k1000.h"
1616

17-
struct loongson_pll {
17+
struct loongson_pll
18+
{
1819
rt_uint64_t PLL_SYS_0;
1920
rt_uint64_t PLL_SYS_1;
2021
rt_uint64_t PLL_DDR_0;

‎bsp/ls2kdev/drivers/drv_gpio.c‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ static void loongson_pin_mode(struct rt_device *device, rt_base_t pin, rt_base_t
2525
gpio = (void *)device->user_data;
2626
m = (rt_uint64_t)1 << pin;
2727

28-
switch (mode) {
28+
switch (mode)
29+
{
2930
case PIN_MODE_OUTPUT:
3031
gpio->GPIO0_OEN &= ~m;
3132
break;
@@ -52,7 +53,8 @@ static void loongson_pin_write(struct rt_device *device, rt_base_t pin, rt_base_
5253
struct loongson_gpio *gpio;
5354
rt_uint64_t m;
5455

55-
if (pin < 0 || pin >= 60) {
56+
if (pin < 0 || pin >= 60)
57+
{
5658
rt_kprintf("error\n");
5759
return;
5860
}
@@ -90,19 +92,19 @@ static rt_err_t loongson_pin_attach_irq(struct rt_device *device, rt_int32_t pin
9092

9193
gpio = (void *)device->user_data;
9294

93-
if(pin < 4)
95+
if (pin < 4)
9496
{
9597
index = pin;
9698
}
97-
else if(pin < 32)
99+
else if (pin < 32)
98100
{
99101
index = 5;
100102
}
101103
else
102104
{
103105
index = 6;
104106
}
105-
107+
106108
_g_gpio_irq_tbl[index].irq_cb[pin] = hdr;
107109
_g_gpio_irq_tbl[index].irq_arg[pin] = args;
108110
_g_gpio_irq_tbl[index].irq_type[pin] = mode;
@@ -120,11 +122,11 @@ static rt_err_t loongson_pin_detach_irq(struct rt_device *device, rt_int32_t pin
120122
gpio = (void *)device->user_data;
121123

122124
rt_uint8_t index;
123-
if(pin < 4)
125+
if (pin < 4)
124126
{
125127
index = pin;
126128
}
127-
else if(pin < 32)
129+
else if (pin < 32)
128130
{
129131
index = 5;
130132
}
@@ -146,11 +148,11 @@ static rt_err_t loongson_pin_irq_enable(struct rt_device *device, rt_base_t pin,
146148
gpio = (void *)device->user_data;
147149

148150
rt_uint8_t index;
149-
if(pin < 4)
151+
if (pin < 4)
150152
{
151153
index = pin;
152154
}
153-
else if(pin < 32)
155+
else if (pin < 32)
154156
{
155157
index = 5;
156158
}
@@ -173,36 +175,36 @@ static void gpio_irq_handler(int irq, void *param)
173175
rt_uint32_t value;
174176
rt_uint32_t tmpvalue;
175177

176-
if(irq == LS2K_GPIO0_INT_IRQ)
178+
if (irq == LS2K_GPIO0_INT_IRQ)
177179
{
178180
pin = 0;
179181
}
180-
else if(irq == LS2K_GPIO1_INT_IRQ)
182+
else if (irq == LS2K_GPIO1_INT_IRQ)
181183
{
182184
pin = 1;
183185
}
184-
else if(irq == LS2K_GPIO2_INT_IRQ)
186+
else if (irq == LS2K_GPIO2_INT_IRQ)
185187
{
186188
pin = 2;
187189
}
188-
else if(irq == LS2K_GPIO3_INT_IRQ)
190+
else if (irq == LS2K_GPIO3_INT_IRQ)
189191
{
190192
pin = 3;
191193
}
192-
else if(irq == LS2K_GPIO_INTLO_IRQ)
194+
else if (irq == LS2K_GPIO_INTLO_IRQ)
193195
{
194196
pin = 4;
195197
}
196198
else
197199
{
198200
pin = 32;
199201
}
200-
202+
201203
while (value)
202204
{
203205
if ((value & 0x1) && (irq_def->irq_cb[pin] != RT_NULL))
204206
{
205-
if(irq_def->state[pin])
207+
if (irq_def->state[pin])
206208
{
207209
irq_def->irq_cb[pin](irq_def->irq_arg[pin]);
208210
}
@@ -212,7 +214,8 @@ static void gpio_irq_handler(int irq, void *param)
212214
}
213215
}
214216

215-
static struct rt_pin_ops loongson_pin_ops = {
217+
static struct rt_pin_ops loongson_pin_ops =
218+
{
216219
.pin_mode = loongson_pin_mode,
217220
.pin_write = loongson_pin_write,
218221
.pin_read = loongson_pin_read,

‎bsp/ls2kdev/drivers/drv_pwm.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
#define CTRL_INVERT (1UL<<9)
2929
#define CTRL_DZONE (1UL<<10)
3030

31-
struct loongson_pwm {
31+
struct loongson_pwm
32+
{
3233
rt_uint32_t __PAD0;
3334
rt_uint32_t low_buffer;
3435
rt_uint32_t full_buffer;
@@ -91,7 +92,8 @@ static rt_err_t loongson_pwm_ioctl(struct rt_device_pwm *device, int cmd, void *
9192

9293
cfg = (void *)arg;
9394

94-
switch (cmd) {
95+
switch (cmd)
96+
{
9597
case PWM_CMD_ENABLE:
9698
rc = loongson_pwm_enable(device, cfg->channel);
9799
break;
@@ -111,18 +113,21 @@ static rt_err_t loongson_pwm_ioctl(struct rt_device_pwm *device, int cmd, void *
111113
return rc;
112114
}
113115

114-
struct rt_pwm_ops loongson_pwm_ops = {
116+
struct rt_pwm_ops loongson_pwm_ops =
117+
{
115118
.control = loongson_pwm_ioctl,
116119
};
117120

118-
struct rt_device_pwm loongson_pwm = {
121+
struct rt_device_pwm loongson_pwm =
122+
{
119123
.ops = &loongson_pwm_ops,
120124
};
121125

122126
int loongson_pwm_init(void)
123127
{
124128
int rc = RT_EOK;
125-
static rt_uint32_t *priv[] = {
129+
static rt_uint32_t *priv[] =
130+
{
126131
(void *)PWM0_BASE,
127132
(void *)PWM1_BASE,
128133
(void *)PWM2_BASE,

‎bsp/ls2kdev/drivers/drv_rtc.c‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
#ifdef RT_USING_RTC
2121

22-
struct loongson_rtc {
22+
struct loongson_rtc
23+
{
2324
rt_uint32_t sys_toytrim;
2425
rt_uint32_t sys_toywrite0;
2526
rt_uint32_t sys_toywrite1;
@@ -45,7 +46,8 @@ struct loongson_rtc {
4546
#define __BF(number, n, m) __RBF((number>>m), (n-m+1))
4647
#define BF(number, n, m) (m<n ? __BF(number, n, m) : __BF(number, m, n))
4748

48-
struct rtctime {
49+
struct rtctime
50+
{
4951
rt_uint32_t sys_toyread0;
5052
rt_uint32_t sys_toyread1;
5153
rt_uint32_t sys_rtcread0;
@@ -106,7 +108,7 @@ static rt_err_t rt_rtc_open(rt_device_t dev, rt_uint16_t oflag)
106108
return RT_EOK;
107109
}
108110

109-
static rt_size_t rt_rtc_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t size)
111+
static rt_size_t rt_rtc_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
110112
{
111113
return 0;
112114
}
@@ -133,7 +135,8 @@ static rt_err_t rt_rtc_ioctl(rt_device_t dev, int cmd, void *args)
133135
rtctm.sys_rtcread0 = hw_rtc->sys_rtcread0;
134136
tmptime = *localrtctime(&rtctm);
135137

136-
switch (cmd) {
138+
switch (cmd)
139+
{
137140
case RT_DEVICE_CTRL_RTC_GET_TIME:
138141
*t = mktime(&tmptime);
139142
break;
@@ -164,7 +167,8 @@ static rt_err_t rt_rtc_ioctl(rt_device_t dev, int cmd, void *args)
164167

165168
int rt_hw_rtc_init(void)
166169
{
167-
static struct rt_device rtc = {
170+
static struct rt_device rtc =
171+
{
168172
.type = RT_Device_Class_RTC,
169173
.init = RT_NULL,
170174
.open = rt_rtc_open,

0 commit comments

Comments
 (0)