Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-02-08 03:03:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix for art-pi smart

Browse Source
This commit is contained in:
xiao-mang
2024-04-19 12:02:52 +08:00
committed by Rbb666
parent b50a53129f
commit 4de96450be
8 changed files with 427 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
bsp/nxp/imx/imx6ull-smart/.config
View File

File diff suppressed because it is too large Load Diff

74
bsp/nxp/imx/imx6ull-smart/README.md
View File

@@ -1,32 +1,68 @@
# RT-Thread Smart for i.MX6ULL
这是一份ART-pi smart开发板的BSP，支持smart模式也支持传统的RTOS模式；
这是一份ART-pi smart开发板的BSP，支持smart模式
ART-pi smart采用了米尔科技的imx6ull核心板，硬件由韦东山团队完成，由社区来完成整体的BSP。硬件规格情况如下：
![硬件资源](figures/hw_resources.png)
## 如何编译
## 应用列表
如果使用smart的模式，请使用smart sdk环境，然后进入到这个bsp目录，执行
-[x] cpp_tc
-[x] hello
-[x] zlib_tc
-[x] smart-fetch
-[x] umailbox
-[x] busybox命令(可通过help查看)
-[x] WIFI
-[x] EMMC读写
下列应用支持ash后才可以使用
-[ ] shm_ping
-[ ]shm_pong
-[ ]webclient
-[ ]webserver
## 应用编译
参考https://github.com/RT-Thread/userapps.git的README.md搭建xmake编译环境并编译smart应用
生成的应用在userapps/apps/build/rootfs文件夹中，将它们拷贝到sd卡中
## 内核编译
* 注意：请使用xmake下载下来的工具链，工具链具体位置在
```bash
scons
~/.xmake/packages/a/arm-smart-musleabi/211536-3de435f234/f5d0c3febbd2497fa950eb569871a3c0
```
进行编译；
* 更新在线wifi软件包
```bash
source ~/.env/env.sh
pkgs --update
```
如果使用RTOS模式，请确保在menuconfig中不选择smart模式，然后执行
* 进入到rt-thread/bsp/nxp/imx/imx6ull-smart目录，执行
```bash
scons
scons -j12
```
进行编译。
## 启动内核
## 如何运行
* 从eMMC中加载运行
* 从eMMC中加载运行(目前不推荐)
```bash
bootcmd=fatload mmc 1:1 0x80001000 /kernel/rtthread.bin; dcache flush; go 0x80001000
@@ -39,3 +75,19 @@ tftp 0x80001000 rtthread.bin
dcache flush
go 0x80001000
```
* 从sd卡启动 (目前推荐)
```bash
fatload mmc 0:1 0x80001000 rtthread.bin; dcache flush; go 0x80001000
```
## 待改进
* 支持ash开机自启动
* 以太网网络问题
* Emmc1、2、3 mkfs失败
* 从emmc启动内核

2
bsp/nxp/imx/imx6ull-smart/applications/init_wifi.c
View File

@@ -28,7 +28,7 @@ int rw007_wifi_init(void)
rt_kprintf("%s wi-fi configuration file not exist in sd card!\n", WIFI_SH_PATH);
}
return 0
return 0;
}
INIT_APP_EXPORT(rw007_wifi_init);
#endif

6
bsp/nxp/imx/imx6ull-smart/applications/mnt.c
View File

@@ -20,6 +20,7 @@ int mnt_init(void)
rt_thread_mdelay(500);
int part_id = 0;
#if 0
if (dfs_mount("emmc0", "/", "elm", 0, (void *)part_id) != 0)
{
rt_kprintf("Dir / emmc mount failed!\n");
@@ -29,11 +30,12 @@ int mnt_init(void)
{
rt_kprintf("emmc file system initialization done!\n");
}
#endif
part_id = 0;
if (dfs_mount("sd0", "/mnt/sd0", "elm", 0, (void *)part_id) != 0)
if (dfs_mount("sd0", "/", "elm", 0, (void *)part_id) != 0)
{
rt_kprintf("Dir /mnt/sd0 mount failed!\n");
rt_kprintf("Dir / mount failed!\n");
return -1;
}
else

137
bsp/nxp/imx/imx6ull-smart/rtconfig.h
View File

@@ -1,9 +1,6 @@
#ifndef RT_CONFIG_H__
#define RT_CONFIG_H__
/* Automatically generated file; DO NOT EDIT. */
/* RT-Thread Project Configuration */
/* RT-Thread Kernel */
#define RT_NAME_MAX 8
@@ -26,6 +23,7 @@
/* kservice optimization */
#define RT_KSERVICE_USING_STDLIB
/* end of kservice optimization */
#define RT_USING_DEBUG
#define RT_DEBUGING_COLOR
#define RT_DEBUGING_CONTEXT
@@ -38,6 +36,7 @@
#define RT_USING_MAILBOX
#define RT_USING_MESSAGEQUEUE
#define RT_USING_SIGNALS
/* end of Inter-Thread communication */
/* Memory Management */
@@ -49,15 +48,17 @@
#define RT_USING_SMALL_MEM_AS_HEAP
#define RT_USING_MEMTRACE
#define RT_USING_HEAP
/* end of Memory Management */
#define RT_USING_DEVICE
#define RT_USING_DEVICE_OPS
#define RT_USING_INTERRUPT_INFO
#define RT_USING_CONSOLE
#define RT_CONSOLEBUF_SIZE 256
#define RT_CONSOLE_DEVICE_NAME "uart0"
#define RT_VER_NUM 0x50100
#define RT_VER_NUM 0x50200
#define RT_USING_STDC_ATOMIC
#define RT_BACKTRACE_LEVEL_MAX_NR 32
/* end of RT-Thread Kernel */
#define RT_USING_CACHE
#define RT_USING_HW_ATOMIC
#define RT_USING_CPU_FFS
@@ -114,6 +115,7 @@
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512
#define RT_DFS_ELM_REENTRANT
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
/* end of elm-chan's FatFs, Generic FAT Filesystem Module */
#define RT_USING_DFS_DEVFS
#define RT_USING_DFS_ROMFS
#define RT_USING_DFS_PTYFS
@@ -128,6 +130,8 @@
#define RT_PAGECACHE_HASH_NR 1024
#define RT_PAGECACHE_GC_WORK_LEVEL 90
#define RT_PAGECACHE_GC_STOP_LEVEL 70
/* end of page cache config */
/* end of DFS: device virtual file system */
/* Device Drivers */
@@ -159,6 +163,32 @@
#define RT_TOUCH_PIN_IRQ
#define RT_USING_LCD
#define RT_USING_DEV_BUS
#define RT_USING_WIFI
#define RT_WLAN_DEVICE_STA_NAME "wlan0"
#define RT_WLAN_DEVICE_AP_NAME "wlan1"
#define RT_WLAN_SSID_MAX_LENGTH 32
#define RT_WLAN_PASSWORD_MAX_LENGTH 32
#define RT_WLAN_DEV_EVENT_NUM 2
#define RT_WLAN_MANAGE_ENABLE
#define RT_WLAN_SCAN_WAIT_MS 10000
#define RT_WLAN_CONNECT_WAIT_MS 10000
#define RT_WLAN_SCAN_SORT
#define RT_WLAN_MSH_CMD_ENABLE
#define RT_WLAN_JOIN_SCAN_BY_MGNT
#define RT_WLAN_AUTO_CONNECT_ENABLE
#define AUTO_CONNECTION_PERIOD_MS 2000
#define RT_WLAN_CFG_ENABLE
#define RT_WLAN_CFG_INFO_MAX 3
#define RT_WLAN_PROT_ENABLE
#define RT_WLAN_PROT_NAME_LEN 8
#define RT_WLAN_PROT_MAX 2
#define RT_WLAN_DEFAULT_PROT "lwip"
#define RT_WLAN_PROT_LWIP_ENABLE
#define RT_WLAN_PROT_LWIP_NAME "lwip"
#define RT_WLAN_WORK_THREAD_ENABLE
#define RT_WLAN_WORKQUEUE_THREAD_NAME "wlan"
#define RT_WLAN_WORKQUEUE_THREAD_SIZE 2048
#define RT_WLAN_WORKQUEUE_THREAD_PRIO 15
#define RT_USING_PIN
#define RT_USING_KTIME
@@ -172,6 +202,8 @@
#define _RT_USB_DEVICE_WINUSB
#define RT_USB_DEVICE_WINUSB
#define RT_WINUSB_GUID "{6860DC3C-C05F-4807-8807-1CA861CC1D66}"
/* end of Using USB */
/* end of Device Drivers */
/* C/C++ and POSIX layer */
@@ -183,6 +215,8 @@
#define RT_LIBC_TZ_DEFAULT_HOUR 8
#define RT_LIBC_TZ_DEFAULT_MIN 0
#define RT_LIBC_TZ_DEFAULT_SEC 0
/* end of Timezone and Daylight Saving Time */
/* end of ISO-ANSI C layer */
/* POSIX (Portable Operating System Interface) layer */
@@ -199,6 +233,9 @@
/* Socket is in the 'Network' category */
/* end of Interprocess Communication (IPC) */
/* end of POSIX (Portable Operating System Interface) layer */
/* end of C/C++ and POSIX layer */
/* Network */
@@ -208,6 +245,7 @@
/* Docking with protocol stacks */
#define SAL_USING_LWIP
/* end of Docking with protocol stacks */
#define SAL_USING_POSIX
#define RT_USING_NETDEV
#define NETDEV_USING_IFCONFIG
@@ -235,6 +273,7 @@
#define RT_LWIP_IPADDR "192.168.1.30"
#define RT_LWIP_GWADDR "192.168.1.1"
#define RT_LWIP_MSKADDR "255.255.255.0"
/* end of Static IPv4 Address */
#define RT_LWIP_UDP
#define RT_LWIP_TCP
#define RT_LWIP_RAW
@@ -249,6 +288,7 @@
#define RT_LWIP_TCPTHREAD_PRIORITY 10
#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
#define RT_LWIP_TCPTHREAD_STACKSIZE 8192
#define LWIP_NO_TX_THREAD
#define RT_LWIP_ETHTHREAD_PRIORITY 12
#define RT_LWIP_ETHTHREAD_STACKSIZE 8192
#define RT_LWIP_ETHTHREAD_MBOX_SIZE 8
@@ -263,9 +303,11 @@
#define RT_LWIP_NETIF_LOOPBACK
#define LWIP_NETIF_LOOPBACK 1
#define RT_LWIP_USING_PING
/* end of Network */
/* Memory protection */
/* end of Memory protection */
/* Utilities */
@@ -281,6 +323,7 @@
#define ULOG_OUTPUT_TIME
#define ULOG_OUTPUT_LEVEL
#define ULOG_OUTPUT_TAG
/* end of log format */
#define ULOG_BACKEND_USING_CONSOLE
#define RT_USING_RESOURCE_ID
#define RT_USING_ADT
@@ -288,6 +331,7 @@
#define RT_USING_ADT_BITMAP
#define RT_USING_ADT_HASHMAP
#define RT_USING_ADT_REF
/* end of Utilities */
#define RT_USING_LWP
#define RT_LWP_MAX_NR 30
#define LWP_TASK_STACK_SIZE 16384
@@ -302,9 +346,12 @@
/* Memory management */
/* end of Memory management */
/* end of RT-Thread Components */
/* RT-Thread Utestcases */
/* end of RT-Thread Utestcases */
/* RT-Thread online packages */
@@ -315,119 +362,178 @@
/* Marvell WiFi */
/* end of Marvell WiFi */
/* Wiced WiFi */
/* end of Wiced WiFi */
#define PKG_USING_RW007
#define PKG_USING_RW007_LATEST_VERSION
#define RW007_NOT_USE_EXAMPLE_DRIVERS
#define RW007_SPI_MAX_HZ 30000000
/* CYW43012 WiFi */
/* end of CYW43012 WiFi */
/* BL808 WiFi */
/* end of BL808 WiFi */
/* CYW43439 WiFi */
/* end of CYW43439 WiFi */
/* end of Wi-Fi */
/* IoT Cloud */
/* end of IoT Cloud */
/* end of IoT - internet of things */
/* security packages */
/* end of security packages */
/* language packages */
/* JSON: JavaScript Object Notation, a lightweight data-interchange format */
/* end of JSON: JavaScript Object Notation, a lightweight data-interchange format */
/* XML: Extensible Markup Language */
/* end of XML: Extensible Markup Language */
/* end of language packages */
/* multimedia packages */
/* LVGL: powerful and easy-to-use embedded GUI library */
/* end of LVGL: powerful and easy-to-use embedded GUI library */
/* u8g2: a monochrome graphic library */
/* end of u8g2: a monochrome graphic library */
/* end of multimedia packages */
/* tools packages */
/* end of tools packages */
/* system packages */
/* enhanced kernel services */
/* end of enhanced kernel services */
/* acceleration: Assembly language or algorithmic acceleration packages */
/* end of acceleration: Assembly language or algorithmic acceleration packages */
/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
/* end of CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
/* Micrium: Micrium software products porting for RT-Thread */
/* end of Micrium: Micrium software products porting for RT-Thread */
/* end of system packages */
/* peripheral libraries and drivers */
/* sensors drivers */
/* end of sensors drivers */
/* touch drivers */
/* end of touch drivers */
/* Kendryte SDK */
/* end of Kendryte SDK */
/* end of peripheral libraries and drivers */
/* AI packages */
/* end of AI packages */
/* Signal Processing and Control Algorithm Packages */
/* end of Signal Processing and Control Algorithm Packages */
/* miscellaneous packages */
/* project laboratory */
/* end of project laboratory */
/* samples: kernel and components samples */
/* end of samples: kernel and components samples */
/* entertainment: terminal games and other interesting software packages */
/* end of entertainment: terminal games and other interesting software packages */
/* end of miscellaneous packages */
/* Arduino libraries */
/* Projects and Demos */
/* end of Projects and Demos */
/* Sensors */
/* end of Sensors */
/* Display */
/* end of Display */
/* Timing */
/* end of Timing */
/* Data Processing */
/* end of Data Processing */
/* Data Storage */
/* Communication */
/* end of Communication */
/* Device Control */
/* end of Device Control */
/* Other */
/* end of Other */
/* Signal IO */
/* end of Signal IO */
/* Uncategorized */
/* end of Arduino libraries */
/* end of RT-Thread online packages */
/* Privated Packages of RealThread */
/* Network Utilities */
/* end of Network Utilities */
/* RT-Thread Smart */
/* end of RT-Thread Smart */
/* end of Privated Packages of RealThread */
#define SOC_IMX6ULL
#define CPU_MCIMX6Y2CVM05
#define FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL 1
@@ -438,10 +544,16 @@
/* Select UART Driver */
#define BSP_USING_UART1
/* end of Select UART Driver */
/* Select SPI Driver */
#define BSP_USING_SPI
#define BSP_USING_SPI1
#define BSP_USING_SPI2
#define BSP_USING_SPI3
#define BSP_USING_SPI4
/* end of Select SPI Driver */
/* Select I2C Driver */
@@ -450,6 +562,7 @@
#define I2C3_BAUD_RATE 400000
#define BSP_USING_I2C4
#define I2C4_BAUD_RATE 100000
/* end of Select I2C Driver */
/* Select LCD Driver */
@@ -463,35 +576,51 @@
#define BSP_LCD_HBP 46
#define BSP_LCD_HFP 210
#define BSP_LCD_PLL_DIV 8
/* end of Select LCD Driver */
/* Select SDHC Driver */
#define RT_USING_SDIO1
#define RT_USING_SDIO2
/* end of Select SDHC Driver */
/* Select RTC Driver */
#define BSP_USING_ONCHIP_RTC
/* end of Select RTC Driver */
/* Select PWM Driver */
#define BSP_USING_PWM1
/* end of Select PWM Driver */
/* Select ADC Driver */
/* end of Select ADC Driver */
/* Select WDT Driver */
#define RT_USING_WDT1
#define RT_USING_WDT2
/* end of Select WDT Driver */
/* Select ENET Driver */
#define RT_USING_ENET1
#define RT_USING_ENET2
/* end of Select ENET Driver */
/* Select Wifi Driver */
#define RT_USING_WIFI_RW007
#define RW007_DAFAULT_SSID "rt-thread"
#define RW007_DAFAULT_PASSWARD "12345678"
/* end of Select Wifi Driver */
/* Select USB Driver */
#define BSP_USING_USB_DEVICE
/* end of Select USB Driver */
/* end of Platform Driver Configuration */
#endif

2
components/dfs/dfs_v2/src/dfs_file_mmap.c
View File

@@ -184,7 +184,7 @@ void page_read(struct rt_varea *varea, struct rt_aspace_io_msg *msg)
varea->start, varea->size, varea->offset, varea->attr, varea->flag);
ret = dfs_aspace_mmap_read(file, varea, msg);
if (ret > 0)
if (ret >= 0)
{
msg->response.status = MM_FAULT_STATUS_OK;
if (ret < ARCH_PAGE_SIZE)

2
components/dfs/dfs_v2/src/dfs_pcache.c
View File

@@ -1105,7 +1105,7 @@ int dfs_aspace_read(struct dfs_file *file, void *buf, size_t count, off_t *pos)
}
len = count > len ? len : count;
if (len)
if (len > 0)
{
rt_memcpy(ptr, page->page + *pos - page->fpos, len);
ptr += len;

6
include/rtthread.h
View File

@@ -836,12 +836,6 @@ do \
__FUNCTION__); \
RT_ASSERT(0) \
} \
if (interrupt_disabled == RT_TRUE) \
{ \
rt_kprintf("Function[%s]: interrupt is disabled\n", \
__FUNCTION__); \
RT_ASSERT(0) \
} \
RT_DEBUG_IN_THREAD_CONTEXT; \
} \
} \