From 005b9da3d5233f1f76013543d4817eaf36956a75 Mon Sep 17 00:00:00 2001 From: liang yongxiang Date: Tue, 13 Mar 2018 16:59:45 +0800 Subject: [PATCH 1/7] [bsp] update gcc nocache section --- .../Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld b/bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld index 993d8589a9..e459198fc2 100644 --- a/bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld +++ b/bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld @@ -218,14 +218,14 @@ SECTIONS *(NonCacheable.init) . = ALIGN(4); __noncachedata_init_end__ = .; /* create a global symbol at initialized ncache data end */ - } > m_dtcm + } > m_nocache . = __noncachedata_init_end__; .ncache : { *(NonCacheable) . = ALIGN(4); __noncachedata_end__ = .; /* define a global symbol at ncache data end */ - } > m_dtcm + } > m_nocache __DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__); text_end = ORIGIN(m_text) + LENGTH(m_text); From 5760c356ef6f6bd8d7bc46aacb588418be78c70b Mon Sep 17 00:00:00 2001 From: liang yongxiang Date: Tue, 13 Mar 2018 17:00:29 +0800 Subject: [PATCH 2/7] [bsp] fix enum warnings --- bsp/imxrt1052-evk/drivers/drv_eth.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bsp/imxrt1052-evk/drivers/drv_eth.c b/bsp/imxrt1052-evk/drivers/drv_eth.c index 2678336c83..3bd9cdcc72 100644 --- a/bsp/imxrt1052-evk/drivers/drv_eth.c +++ b/bsp/imxrt1052-evk/drivers/drv_eth.c @@ -572,9 +572,10 @@ static void phy_monitor_thread_entry(void *parameter) if (link) // link up { - PHY_GetLinkSpeedDuplex(imxrt_eth_device.enet_base, PHY_ADDRESS, &speed, &duplex); + PHY_GetLinkSpeedDuplex(imxrt_eth_device.enet_base, + PHY_ADDRESS, &speed, &duplex); - if (kENET_MiiSpeed10M == speed) + if (kPHY_Speed10M == speed) { dbg_log(DBG_LOG, "10M\n"); } @@ -583,7 +584,7 @@ static void phy_monitor_thread_entry(void *parameter) dbg_log(DBG_LOG, "100M\n"); } - if (kENET_MiiHalfDuplex == duplex) + if (kPHY_HalfDuplex == duplex) { dbg_log(DBG_LOG, "half dumplex\n"); } @@ -592,7 +593,8 @@ static void phy_monitor_thread_entry(void *parameter) dbg_log(DBG_LOG, "full dumplex\n"); } - if ((imxrt_eth_device.speed != speed) || (imxrt_eth_device.duplex != duplex)) + if ((imxrt_eth_device.speed != (enet_mii_speed_t)speed) + || (imxrt_eth_device.duplex != (enet_mii_duplex_t)duplex)) { imxrt_eth_device.speed = (enet_mii_speed_t)speed; imxrt_eth_device.duplex = (enet_mii_duplex_t)duplex; From f268ffa5beeb5c74a145fe906e613a330f64450b Mon Sep 17 00:00:00 2001 From: liang yongxiang Date: Tue, 13 Mar 2018 17:03:24 +0800 Subject: [PATCH 3/7] [bsp] delete SDIO test code --- bsp/imxrt1052-evk/applications/sdio_test.c | 147 --------------------- 1 file changed, 147 deletions(-) delete mode 100644 bsp/imxrt1052-evk/applications/sdio_test.c diff --git a/bsp/imxrt1052-evk/applications/sdio_test.c b/bsp/imxrt1052-evk/applications/sdio_test.c deleted file mode 100644 index 0f1f7ddb74..0000000000 --- a/bsp/imxrt1052-evk/applications/sdio_test.c +++ /dev/null @@ -1,147 +0,0 @@ -#include "rtthread.h" -#include -#include "string.h" - -#define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ') -static void dump_hex(const rt_uint8_t *ptr, rt_size_t buflen) -{ - unsigned char *buf = (unsigned char*)ptr; - int i, j; - - for (i=0; iparent.name); - rt_kprintf("the first sector failed.\r\n"); - goto __return; - } - rt_kprintf("\n"); - } - -__return: - if( read_buffer != RT_NULL ) - { - rt_free(read_buffer); - } -} - -static void write_sd__(uint32_t addr, int length, unsigned char data) -{ - int i; - rt_device_t device = RT_NULL; - rt_err_t result; - struct rt_device_blk_geometry geometry; - rt_uint8_t * write_buffer = RT_NULL; - rt_uint8_t * data_point = RT_NULL;; - - device = rt_device_find("sd0"); - rt_device_init(device); - rt_device_open(device,RT_DEVICE_FLAG_RDWR); - - rt_memset(&geometry, 0, sizeof(geometry)); - result = rt_device_control(device, - RT_DEVICE_CTRL_BLK_GETGEOME, - &geometry); - rt_kprintf("device info:\r\n"); - rt_kprintf("sector size : %d byte\r\n", geometry.bytes_per_sector); - rt_kprintf("sector count : %d \r\n", geometry.sector_count); - rt_kprintf("block size : %d byte\r\n", geometry.block_size); - rt_kprintf("\r\n"); - write_buffer = rt_malloc(geometry.bytes_per_sector); - if( write_buffer == RT_NULL ) - { - rt_kprintf("no memory for write_buffer!\r\n"); - goto __return; - } - data_point = write_buffer; - - for(i=data; i -FINSH_FUNCTION_EXPORT_ALIAS(sdio_read, sdior, sdio read test); -FINSH_FUNCTION_EXPORT_ALIAS(sdio_write, sdiow, sdio write test); -#endif From 249d5b5887d3f32a70998b8061efc4868ba84e18 Mon Sep 17 00:00:00 2001 From: liang yongxiang Date: Tue, 13 Mar 2018 17:15:18 +0800 Subject: [PATCH 4/7] [bsp] update IAR and mdk project --- bsp/imxrt1052-evk/project.ewp | 276 +--- bsp/imxrt1052-evk/project.uvoptx | 2160 ++++++++++++++++++++++++++++- bsp/imxrt1052-evk/project.uvprojx | 1946 ++++++++------------------ 3 files changed, 2732 insertions(+), 1650 deletions(-) diff --git a/bsp/imxrt1052-evk/project.ewp b/bsp/imxrt1052-evk/project.ewp index b202eca56b..d3ff73d2a7 100644 --- a/bsp/imxrt1052-evk/project.ewp +++ b/bsp/imxrt1052-evk/project.ewp @@ -220,7 +220,6 @@ SKIP_SYSCLK_INIT EVK_MCIMXRM FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 - FT2_BUILD_LIBRARY RT_USING_DLIBC _DLIB_FILE_DESCRIPTOR @@ -354,38 +353,20 @@ $PROJ_DIR$\..\..\libcpu\arm\common $PROJ_DIR$\..\..\components\drivers\include $PROJ_DIR$\Libraries\drivers - $PROJ_DIR$\..\..\components\dfs\filesystems\devfs - $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\include\freetype - $PROJ_DIR$\..\..\components\gui\include - $PROJ_DIR$\drivers + $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src + $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\posix $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\ipv4 - $PROJ_DIR$\..\..\components\gui\include\rtgui $PROJ_DIR$\. - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\smooth $PROJ_DIR$\..\..\libcpu\arm\cortex-m7 $PROJ_DIR$\..\..\components\dfs\include - $PROJ_DIR$\..\..\components\gui\libraries\lodepng - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\include - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\include\freetype\internal - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\include\freetype\internal\services - $PROJ_DIR$\..\..\components\gui\src + $PROJ_DIR$\..\..\components\dfs\filesystems\devfs $PROJ_DIR$\Libraries\CMSIS\Include $PROJ_DIR$\Libraries\utilities - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\sfnt $PROJ_DIR$\applications $PROJ_DIR$\..\..\components\finsh $PROJ_DIR$\..\..\components\dfs\filesystems\elmfat - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\truetype - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\psnames - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\autofit - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\cache - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\include\freetype\config - $PROJ_DIR$\..\..\components\gui\include\rtgui\widgets - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\src\base - $PROJ_DIR$\..\..\components\gui\libraries\freetype-2.6.2\builds\rt-thread - $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\include\posix + $PROJ_DIR$\drivers $PROJ_DIR$\..\..\components\net\lwip-2.0.2\src\arch\include