Skip to content

Commit 22e8451

Browse files
committed
[BSP] Update imx6ul bsp for Kconfig and UART
1 parent 19de22f commit 22e8451

File tree

10 files changed

+135
-965
lines changed

10 files changed

+135
-965
lines changed

bsp/imx6ul/.config

Lines changed: 99 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ CONFIG_RT_USING_DEVICE=y
7171
# CONFIG_RT_USING_INTERRUPT_INFO is not set
7272
CONFIG_RT_USING_CONSOLE=y
7373
CONFIG_RT_CONSOLEBUF_SIZE=128
74-
CONFIG_RT_CONSOLE_DEVICE_NAME="uart"
75-
CONFIG_RT_VER_NUM=0x40003
74+
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
75+
CONFIG_RT_VER_NUM=0x40004
7676
CONFIG_ARCH_ARM=y
7777
# CONFIG_RT_USING_CPU_FFS is not set
7878
CONFIG_ARCH_ARM_CORTEX_A=y
@@ -177,6 +177,7 @@ CONFIG_RT_USING_POSIX=y
177177
# CONFIG_RT_USING_POSIX_GETLINE is not set
178178
# CONFIG_RT_USING_POSIX_AIO is not set
179179
# CONFIG_RT_USING_MODULE is not set
180+
CONFIG_RT_LIBC_FIXED_TIMEZONE=8
180181

181182
#
182183
# Network
@@ -213,8 +214,14 @@ CONFIG_RT_USING_POSIX=y
213214
# CONFIG_RT_USING_RYM is not set
214215
# CONFIG_RT_USING_ULOG is not set
215216
# CONFIG_RT_USING_UTEST is not set
217+
# CONFIG_RT_USING_RT_LINK is not set
216218
# CONFIG_RT_USING_LWP is not set
217219

220+
#
221+
# RT-Thread Utestcases
222+
#
223+
# CONFIG_RT_USING_UTESTCASES is not set
224+
218225
#
219226
# RT-Thread online packages
220227
#
@@ -282,8 +289,6 @@ CONFIG_RT_USING_POSIX=y
282289
# CONFIG_PKG_USING_LIBRWS is not set
283290
# CONFIG_PKG_USING_TCPSERVER is not set
284291
# CONFIG_PKG_USING_PROTOBUF_C is not set
285-
# CONFIG_PKG_USING_ONNX_PARSER is not set
286-
# CONFIG_PKG_USING_ONNX_BACKEND is not set
287292
# CONFIG_PKG_USING_DLT645 is not set
288293
# CONFIG_PKG_USING_QXWZ is not set
289294
# CONFIG_PKG_USING_SMTP_CLIENT is not set
@@ -297,6 +302,13 @@ CONFIG_RT_USING_POSIX=y
297302
# CONFIG_PKG_USING_PDULIB is not set
298303
# CONFIG_PKG_USING_BTSTACK is not set
299304
# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
305+
# CONFIG_PKG_USING_WAYZ_IOTKIT is not set
306+
# CONFIG_PKG_USING_MAVLINK is not set
307+
# CONFIG_PKG_USING_RAPIDJSON is not set
308+
# CONFIG_PKG_USING_BSAL is not set
309+
# CONFIG_PKG_USING_AGILE_MODBUS is not set
310+
# CONFIG_PKG_USING_AGILE_FTP is not set
311+
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set
300312

301313
#
302314
# security packages
@@ -322,7 +334,10 @@ CONFIG_RT_USING_POSIX=y
322334
# CONFIG_PKG_USING_STEMWIN is not set
323335
# CONFIG_PKG_USING_WAVPLAYER is not set
324336
# CONFIG_PKG_USING_TJPGD is not set
337+
# CONFIG_PKG_USING_PDFGEN is not set
325338
# CONFIG_PKG_USING_HELIX is not set
339+
# CONFIG_PKG_USING_AZUREGUIX is not set
340+
# CONFIG_PKG_USING_TOUCHGFX2RTT is not set
326341

327342
#
328343
# tools packages
@@ -334,16 +349,35 @@ CONFIG_RT_USING_POSIX=y
334349
# CONFIG_PKG_USING_RDB is not set
335350
# CONFIG_PKG_USING_QRCODE is not set
336351
# CONFIG_PKG_USING_ULOG_EASYFLASH is not set
352+
# CONFIG_PKG_USING_ULOG_FILE is not set
353+
# CONFIG_PKG_USING_LOGMGR is not set
337354
# CONFIG_PKG_USING_ADBD is not set
338355
# CONFIG_PKG_USING_COREMARK is not set
339356
# CONFIG_PKG_USING_DHRYSTONE is not set
357+
# CONFIG_PKG_USING_MEMORYPERF is not set
340358
# CONFIG_PKG_USING_NR_MICRO_SHELL is not set
341359
# CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set
342360
# CONFIG_PKG_USING_LUNAR_CALENDAR is not set
343361
# CONFIG_PKG_USING_BS8116A is not set
344362
# CONFIG_PKG_USING_GPS_RMC is not set
345363
# CONFIG_PKG_USING_URLENCODE is not set
346364
# CONFIG_PKG_USING_UMCN is not set
365+
# CONFIG_PKG_USING_LWRB2RTT is not set
366+
# CONFIG_PKG_USING_CPU_USAGE is not set
367+
# CONFIG_PKG_USING_GBK2UTF8 is not set
368+
# CONFIG_PKG_USING_VCONSOLE is not set
369+
# CONFIG_PKG_USING_KDB is not set
370+
# CONFIG_PKG_USING_WAMR is not set
371+
# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set
372+
# CONFIG_PKG_USING_LWLOG is not set
373+
# CONFIG_PKG_USING_ANV_TRACE is not set
374+
# CONFIG_PKG_USING_ANV_MEMLEAK is not set
375+
# CONFIG_PKG_USING_ANV_TESTSUIT is not set
376+
# CONFIG_PKG_USING_ANV_BENCH is not set
377+
# CONFIG_PKG_USING_DEVMEM is not set
378+
# CONFIG_PKG_USING_REGEX is not set
379+
# CONFIG_PKG_USING_MEM_SANDBOX is not set
380+
# CONFIG_PKG_USING_SOLAR_TERMS is not set
347381

348382
#
349383
# system packages
@@ -352,7 +386,6 @@ CONFIG_RT_USING_POSIX=y
352386
# CONFIG_PKG_USING_PERSIMMON is not set
353387
# CONFIG_PKG_USING_CAIRO is not set
354388
# CONFIG_PKG_USING_PIXMAN is not set
355-
# CONFIG_PKG_USING_LWEXT4 is not set
356389
# CONFIG_PKG_USING_PARTITION is not set
357390
# CONFIG_PKG_USING_FAL is not set
358391
# CONFIG_PKG_USING_FLASHDB is not set
@@ -362,6 +395,9 @@ CONFIG_RT_USING_POSIX=y
362395
# CONFIG_PKG_USING_CMSIS is not set
363396
# CONFIG_PKG_USING_DFS_YAFFS is not set
364397
# CONFIG_PKG_USING_LITTLEFS is not set
398+
# CONFIG_PKG_USING_DFS_JFFS2 is not set
399+
# CONFIG_PKG_USING_DFS_UFFS is not set
400+
# CONFIG_PKG_USING_LWEXT4 is not set
365401
# CONFIG_PKG_USING_THREAD_POOL is not set
366402
# CONFIG_PKG_USING_ROBOTS is not set
367403
# CONFIG_PKG_USING_EV is not set
@@ -371,7 +407,26 @@ CONFIG_RT_USING_POSIX=y
371407
# CONFIG_PKG_USING_RAMDISK is not set
372408
# CONFIG_PKG_USING_MININI is not set
373409
# CONFIG_PKG_USING_QBOOT is not set
410+
411+
#
412+
# Micrium: Micrium software products porting for RT-Thread
413+
#
414+
# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
415+
# CONFIG_PKG_USING_UCOSII_WRAPPER is not set
416+
# CONFIG_PKG_USING_UC_CRC is not set
417+
# CONFIG_PKG_USING_UC_CLK is not set
418+
# CONFIG_PKG_USING_UC_COMMON is not set
419+
# CONFIG_PKG_USING_UC_MODBUS is not set
374420
# CONFIG_PKG_USING_PPOOL is not set
421+
# CONFIG_PKG_USING_OPENAMP is not set
422+
# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set
423+
# CONFIG_PKG_USING_RT_MEMCPY_CM is not set
424+
# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set
425+
# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set
426+
# CONFIG_PKG_USING_QFPLIB_M3 is not set
427+
# CONFIG_PKG_USING_LPM is not set
428+
# CONFIG_PKG_USING_TLSF is not set
429+
# CONFIG_PKG_USING_EVENT_RECORDER is not set
375430

376431
#
377432
# peripheral libraries and drivers
@@ -380,6 +435,7 @@ CONFIG_RT_USING_POSIX=y
380435
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
381436
# CONFIG_PKG_USING_SHT2X is not set
382437
# CONFIG_PKG_USING_SHT3X is not set
438+
# CONFIG_PKG_USING_AS7341 is not set
383439
# CONFIG_PKG_USING_STM32_SDIO is not set
384440
# CONFIG_PKG_USING_ICM20608 is not set
385441
# CONFIG_PKG_USING_U8G2 is not set
@@ -427,6 +483,30 @@ CONFIG_RT_USING_POSIX=y
427483
# CONFIG_PKG_USING_LY68L6400 is not set
428484
# CONFIG_PKG_USING_DM9051 is not set
429485
# CONFIG_PKG_USING_SSD1306 is not set
486+
# CONFIG_PKG_USING_QKEY is not set
487+
# CONFIG_PKG_USING_RS485 is not set
488+
# CONFIG_PKG_USING_NES is not set
489+
# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set
490+
# CONFIG_PKG_USING_VDEVICE is not set
491+
# CONFIG_PKG_USING_SGM706 is not set
492+
# CONFIG_PKG_USING_STM32WB55_SDK is not set
493+
# CONFIG_PKG_USING_RDA58XX is not set
494+
# CONFIG_PKG_USING_LIBNFC is not set
495+
# CONFIG_PKG_USING_MFOC is not set
496+
# CONFIG_PKG_USING_TMC51XX is not set
497+
498+
#
499+
# AI packages
500+
#
501+
# CONFIG_PKG_USING_LIBANN is not set
502+
# CONFIG_PKG_USING_NNOM is not set
503+
# CONFIG_PKG_USING_ONNX_BACKEND is not set
504+
# CONFIG_PKG_USING_ONNX_PARSER is not set
505+
# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
506+
# CONFIG_PKG_USING_ELAPACK is not set
507+
# CONFIG_PKG_USING_ULAPACK is not set
508+
# CONFIG_PKG_USING_QUEST is not set
509+
# CONFIG_PKG_USING_NAXOS is not set
430510

431511
#
432512
# miscellaneous packages
@@ -436,6 +516,7 @@ CONFIG_RT_USING_POSIX=y
436516
# CONFIG_PKG_USING_FASTLZ is not set
437517
# CONFIG_PKG_USING_MINILZO is not set
438518
# CONFIG_PKG_USING_QUICKLZ is not set
519+
# CONFIG_PKG_USING_LZMA is not set
439520
# CONFIG_PKG_USING_MULTIBUTTON is not set
440521
# CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set
441522
# CONFIG_PKG_USING_CANFESTIVAL is not set
@@ -456,17 +537,24 @@ CONFIG_RT_USING_POSIX=y
456537
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
457538
# CONFIG_PKG_USING_HELLO is not set
458539
# CONFIG_PKG_USING_VI is not set
459-
# CONFIG_PKG_USING_NNOM is not set
460-
# CONFIG_PKG_USING_LIBANN is not set
461-
# CONFIG_PKG_USING_ELAPACK is not set
540+
# CONFIG_PKG_USING_KI is not set
462541
# CONFIG_PKG_USING_ARMv7M_DWT is not set
463542
# CONFIG_PKG_USING_VT100 is not set
464-
# CONFIG_PKG_USING_TETRIS is not set
465-
# CONFIG_PKG_USING_ULAPACK is not set
466543
# CONFIG_PKG_USING_UKAL is not set
467544
# CONFIG_PKG_USING_CRCLIB is not set
545+
546+
#
547+
# entertainment: terminal games and other interesting software packages
548+
#
468549
# CONFIG_PKG_USING_THREES is not set
469550
# CONFIG_PKG_USING_2048 is not set
551+
# CONFIG_PKG_USING_SNAKE is not set
552+
# CONFIG_PKG_USING_TETRIS is not set
553+
# CONFIG_PKG_USING_DONUT is not set
554+
# CONFIG_PKG_USING_ACLOCK is not set
470555
# CONFIG_PKG_USING_LWGPS is not set
471-
# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set
556+
# CONFIG_PKG_USING_STATE_MACHINE is not set
557+
# CONFIG_PKG_USING_MCURSES is not set
558+
# CONFIG_PKG_USING_COWSAY is not set
559+
CONFIG_RT_USING_UART1=y
472560
CONFIG_SOC_MCIMX6X4=y

bsp/imx6ul/SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ else:
1010
sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
1111
from building import *
1212

13-
TARGET = 'rtthread-imx6.' + rtconfig.TARGET_EXT
13+
TARGET = 'rtthread.' + rtconfig.TARGET_EXT
1414

1515
DefaultEnvironment(tools=[])
1616
env = Environment(tools = ['mingw'],

bsp/imx6ul/drivers/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
config RT_USING_UART1
2+
bool "Enable UART1"
3+
default y

bsp/imx6ul/drivers/iomux/uart_iomux_config.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@
3737
#define MX6UL_PAD_UART1_RX_DATA__UART1_RX1 (IOMUXC_BASE_ADDR+0x088)
3838
#define IOMUXC_UART1_UART_RXD_MUX_SELECT_INPUT1 (IOMUXC_BASE_ADDR+0x624)
3939

40+
#define PIN_CFG(mux_ctl_offset, pad_ctl_offset, select_input_offset, mux_mode, daisy, pad_setting) \
41+
do {\
42+
writel(mux_mode, IOMUXC_BASE_ADDR + mux_ctl_offset);\
43+
if (select_input_offset != 0)\
44+
writel(daisy, IOMUXC_BASE_ADDR + select_input_offset);\
45+
writel(pad_setting, IOMUXC_BASE_ADDR + pad_ctl_offset);\
46+
} while(0);
47+
48+
#define MX6UL_PAD_UART1_TX_DATA__UART1_TX(p) PIN_CFG(0x0084, 0x0310, 0x0624, 0x0, 0x2, p)
49+
#define MX6UL_PAD_UART1_RX_DATA__UART1_RX(p) PIN_CFG(0x0088, 0x0314, 0x0624, 0x0, 0x3, p)
50+
4051
void uart1_iomux_config(void)
4152
{
4253
/* UART1 TXD */

bsp/imx6ul/drivers/serial.c

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
#include <rthw.h>
1212
#include <registers/regsuart.h>
1313
#include <imx_uart.h>
14-
1514
#include <rtdevice.h>
16-
1715
#include "serial.h"
1816

1917
struct hw_uart_device
@@ -123,16 +121,6 @@ static const struct rt_uart_ops _uart_ops =
123121
uart_getc,
124122
};
125123

126-
#ifdef RT_USING_UART0
127-
/* UART device driver structure */
128-
static struct hw_uart_device _uart0_device =
129-
{
130-
HW_UART0,
131-
IMX_INT_UART0
132-
};
133-
static struct rt_serial_device _serial0;
134-
#endif
135-
136124
#ifdef RT_USING_UART1
137125
/* UART1 device driver structure */
138126
static struct hw_uart_device _uart1_device =
@@ -156,18 +144,6 @@ int rt_hw_uart_init(void)
156144
config.invert = NRZ_NORMAL;
157145
config.bufsz = RT_SERIAL_RB_BUFSZ;
158146

159-
#ifdef RT_USING_UART0
160-
uart = &_uart0_device;
161-
162-
_serial0.ops = &_uart_ops;
163-
_serial0.config = config;
164-
165-
/* register UART1 device */
166-
rt_hw_serial_register(&_serial0, "uart0",
167-
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
168-
uart);
169-
#endif
170-
171147
#ifdef RT_USING_UART1
172148
uart = &_uart1_device;
173149
_serial1.ops = &_uart_ops;
File renamed without changes.

0 commit comments

Comments
 (0)