From 1a15b454793251b21f8697b739145e2fb24c3d65 Mon Sep 17 00:00:00 2001 From: BernardXiong Date: Wed, 16 Mar 2022 14:28:09 +0800 Subject: [PATCH] [BSP] fix ci build issue --- bsp/imx6ul/.config | 95 ++++++++++++++++++- bsp/imx6ul/rtconfig.h | 16 ++++ bsp/imx6ull-artpi-smart/.config | 23 ++++- bsp/imx6ull-artpi-smart/.vscode/smart.json | 7 +- .../applications/init_em.c | 50 ++++++++++ bsp/imx6ull-artpi-smart/applications/main.c | 1 + bsp/imx6ull-artpi-smart/applications/mnt.c | 2 +- bsp/imx6ull-artpi-smart/drivers/Kconfig | 2 + bsp/imx6ull-artpi-smart/drivers/drv_eth.c | 26 ++--- bsp/imx6ull-artpi-smart/drivers/drv_lcd.c | 2 - bsp/imx6ull-artpi-smart/rtconfig.h | 6 ++ components/libc/compilers/common/time.c | 1 + 12 files changed, 204 insertions(+), 27 deletions(-) create mode 100644 bsp/imx6ull-artpi-smart/applications/init_em.c diff --git a/bsp/imx6ul/.config b/bsp/imx6ul/.config index 15489551c1..a707d57c5e 100644 --- a/bsp/imx6ul/.config +++ b/bsp/imx6ul/.config @@ -149,13 +149,16 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_PM is not set -# CONFIG_RT_USING_RTC is not set +CONFIG_RT_USING_RTC=y +# CONFIG_RT_USING_ALARM is not set +CONFIG_RT_USING_SOFT_RTC=y # CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set # CONFIG_RT_USING_AUDIO is not set # CONFIG_RT_USING_SENSOR is not set # CONFIG_RT_USING_TOUCH is not set +# CONFIG_RT_USING_LCD is not set # CONFIG_RT_USING_HWCRYPTO is not set # CONFIG_RT_USING_PULSE_ENCODER is not set # CONFIG_RT_USING_INPUT_CAPTURE is not set @@ -224,6 +227,7 @@ CONFIG_RT_USING_POSIX=y # # IoT - internet of things # +# CONFIG_PKG_USING_LWIP is not set # CONFIG_PKG_USING_LORAWAN_DRIVER is not set # CONFIG_PKG_USING_PAHOMQTT is not set # CONFIG_PKG_USING_UMQTT is not set @@ -277,7 +281,9 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_JIOT-C-SDK is not set # CONFIG_PKG_USING_UCLOUD_IOT_SDK is not set # CONFIG_PKG_USING_JOYLINK is not set +# CONFIG_PKG_USING_EZ_IOT_OS is not set # CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set # CONFIG_PKG_USING_OTA_DOWNLOADER is not set # CONFIG_PKG_USING_IPMSG is not set # CONFIG_PKG_USING_LSSDP is not set @@ -311,6 +317,7 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set # CONFIG_PKG_USING_HM is not set # CONFIG_PKG_USING_SMALL_MODBUS is not set +# CONFIG_PKG_USING_NET_SERVER is not set # # security packages @@ -324,6 +331,7 @@ CONFIG_RT_USING_POSIX=y # # language packages # +# CONFIG_PKG_USING_LUATOS_SOC is not set # CONFIG_PKG_USING_LUA is not set # CONFIG_PKG_USING_JERRYSCRIPT is not set # CONFIG_PKG_USING_MICROPYTHON is not set @@ -367,6 +375,7 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_MCURSES is not set # CONFIG_PKG_USING_TERMBOX is not set # CONFIG_PKG_USING_VT100 is not set +# CONFIG_PKG_USING_QRCODE is not set # # tools packages @@ -377,7 +386,6 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_SYSTEMVIEW is not set # CONFIG_PKG_USING_SEGGER_RTT is not set # CONFIG_PKG_USING_RDB is not set -# CONFIG_PKG_USING_QRCODE is not set # CONFIG_PKG_USING_ULOG_EASYFLASH is not set # CONFIG_PKG_USING_ULOG_FILE is not set # CONFIG_PKG_USING_LOGMGR is not set @@ -422,6 +430,14 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set +# +# POSIX extension functions +# +# CONFIG_PKG_USING_POSIX_GETLINE is not set +# CONFIG_PKG_USING_POSIX_WCWIDTH is not set +# CONFIG_PKG_USING_POSIX_ITOA is not set +# CONFIG_PKG_USING_POSIX_STRINGS is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -474,10 +490,10 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set # CONFIG_PKG_USING_ARM_2D is not set -# CONFIG_PKG_USING_WCWIDTH is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set -# CONFIG_PKG_USING_USB_STACK is not set +# CONFIG_PKG_USING_CHERRYUSB is not set +# CONFIG_PKG_USING_KMULTI_RTIMER is not set # # peripheral libraries and drivers @@ -501,6 +517,7 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set # CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_MULTI_INFRARED is not set # CONFIG_PKG_USING_AGILE_BUTTON is not set # CONFIG_PKG_USING_AGILE_LED is not set # CONFIG_PKG_USING_AT24CXX is not set @@ -534,6 +551,7 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_SSD1306 is not set # CONFIG_PKG_USING_QKEY is not set # CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_RS232 is not set # CONFIG_PKG_USING_NES is not set # CONFIG_PKG_USING_VIRTUAL_SENSOR is not set # CONFIG_PKG_USING_VDEVICE is not set @@ -551,9 +569,12 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set # CONFIG_PKG_USING_MISAKA_RGB_BLING is not set +# CONFIG_PKG_USING_LORA_MODEM_DRIVER is not set # CONFIG_PKG_USING_BL_MCU_SDK is not set # CONFIG_PKG_USING_SOFT_SERIAL is not set # CONFIG_PKG_USING_MB85RS16 is not set +# CONFIG_PKG_USING_CW2015 is not set +# CONFIG_PKG_USING_RFM300 is not set # # AI packages @@ -572,6 +593,10 @@ CONFIG_RT_USING_POSIX=y # miscellaneous packages # +# +# project laboratory +# + # # samples: kernel and components samples # @@ -604,6 +629,7 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_CANFESTIVAL is not set # CONFIG_PKG_USING_ZLIB is not set # CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_HEATSHRINK is not set # CONFIG_PKG_USING_DSTR is not set # CONFIG_PKG_USING_TINYFRAME is not set # CONFIG_PKG_USING_KENDRYTE_DEMO is not set @@ -618,6 +644,67 @@ CONFIG_RT_USING_POSIX=y # CONFIG_PKG_USING_CRCLIB is not set # CONFIG_PKG_USING_LWGPS is not set # CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_DESIGN_PATTERN is not set +# CONFIG_PKG_USING_CONTROLLER is not set +# CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set +# CONFIG_PKG_USING_MFBD is not set + +# +# Privated Packages of RealThread +# +# CONFIG_PKG_USING_CODEC is not set +# CONFIG_PKG_USING_PLAYER is not set +# CONFIG_PKG_USING_MPLAYER is not set +# CONFIG_PKG_USING_PERSIMMON_SRC is not set +# CONFIG_PKG_USING_JS_PERSIMMON is not set +# CONFIG_PKG_USING_JERRYSCRIPT_WIN32 is not set + +# +# Network Utilities +# +# CONFIG_PKG_USING_WICED is not set +# CONFIG_PKG_USING_CLOUDSDK is not set +# CONFIG_PKG_USING_POWER_MANAGER is not set +# CONFIG_PKG_USING_RT_OTA is not set +# CONFIG_PKG_USING_RTINSIGHT is not set +# CONFIG_PKG_USING_SMARTCONFIG is not set +# CONFIG_PKG_USING_RTX is not set +# CONFIG_RT_USING_TESTCASE is not set +# CONFIG_PKG_USING_NGHTTP2 is not set +# CONFIG_PKG_USING_AVS is not set +# CONFIG_PKG_USING_ALI_LINKKIT is not set +# CONFIG_PKG_USING_STS is not set +# CONFIG_PKG_USING_DLMS is not set +# CONFIG_PKG_USING_AUDIO_FRAMEWORK is not set +# CONFIG_PKG_USING_ZBAR is not set +# CONFIG_PKG_USING_MCF is not set +# CONFIG_PKG_USING_URPC is not set +# CONFIG_PKG_USING_DCM is not set +# CONFIG_PKG_USING_EMQ is not set +# CONFIG_PKG_USING_CFGM is not set +# CONFIG_PKG_USING_RT_CMSIS_DAP is not set +# CONFIG_PKG_USING_SMODULE is not set +# CONFIG_PKG_USING_SNFD is not set +# CONFIG_PKG_USING_UDBD is not set +# CONFIG_PKG_USING_BENCHMARK is not set +# CONFIG_PKG_USING_UBJSON is not set +# CONFIG_PKG_USING_DATATYPE is not set +# CONFIG_PKG_USING_FASTFS is not set +# CONFIG_PKG_USING_RIL is not set +# CONFIG_PKG_USING_WATCH_DCM_SVC is not set +# CONFIG_PKG_USING_WATCH_APP_FWK is not set +# CONFIG_PKG_USING_GUI_TEST is not set +# CONFIG_PKG_USING_PMEM is not set +# CONFIG_PKG_USING_LWRDP is not set +# CONFIG_PKG_USING_MASAN is not set +# CONFIG_PKG_USING_BSDIFF_LIB is not set +# CONFIG_PKG_USING_PRC_DIFF is not set + +# +# RT-Thread Smart +# +# CONFIG_PKG_USING_UKERNEL is not set +# CONFIG_PKG_USING_TRACE_AGENT is not set # # Platform Driver Configuration diff --git a/bsp/imx6ul/rtconfig.h b/bsp/imx6ul/rtconfig.h index 20900ec5fd..9c7c40433d 100644 --- a/bsp/imx6ul/rtconfig.h +++ b/bsp/imx6ul/rtconfig.h @@ -87,6 +87,8 @@ #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_TTY #define RT_USING_PIN +#define RT_USING_RTC +#define RT_USING_SOFT_RTC /* Using USB */ @@ -157,6 +159,9 @@ /* enhanced kernel services */ +/* POSIX extension functions */ + + /* acceleration: Assembly language or algorithmic acceleration packages */ @@ -174,12 +179,23 @@ /* miscellaneous packages */ +/* project laboratory */ + /* samples: kernel and components samples */ /* entertainment: terminal games and other interesting software packages */ +/* Privated Packages of RealThread */ + + +/* Network Utilities */ + + +/* RT-Thread Smart */ + + /* Platform Driver Configuration */ /* Select UART Driver */ diff --git a/bsp/imx6ull-artpi-smart/.config b/bsp/imx6ull-artpi-smart/.config index 292c39ddf6..1c92c4a935 100644 --- a/bsp/imx6ull-artpi-smart/.config +++ b/bsp/imx6ull-artpi-smart/.config @@ -165,7 +165,7 @@ CONFIG_RT_USING_TTY=y # CONFIG_RT_TTY_DEBUG is not set # CONFIG_RT_USING_CAN is not set # CONFIG_RT_USING_HWTIMER is not set -# CONFIG_RT_USING_CPUTIME is not set +CONFIG_RT_USING_CPUTIME=y CONFIG_RT_USING_I2C=y # CONFIG_RT_I2C_DEBUG is not set # CONFIG_RT_USING_I2C_BITOPS is not set @@ -200,6 +200,7 @@ CONFIG_RT_USING_WDT=y # CONFIG_RT_USING_AUDIO is not set # CONFIG_RT_USING_SENSOR is not set CONFIG_RT_USING_TOUCH=y +CONFIG_RT_USING_LCD=y # CONFIG_RT_USING_HWCRYPTO is not set # CONFIG_RT_USING_PULSE_ENCODER is not set # CONFIG_RT_USING_INPUT_CAPTURE is not set @@ -384,6 +385,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # # IoT - internet of things # +# CONFIG_PKG_USING_LWIP is not set # CONFIG_PKG_USING_LORAWAN_DRIVER is not set # CONFIG_PKG_USING_PAHOMQTT is not set # CONFIG_PKG_USING_UMQTT is not set @@ -439,6 +441,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_JOYLINK is not set # CONFIG_PKG_USING_EZ_IOT_OS is not set # CONFIG_PKG_USING_NIMBLE is not set +# CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set # CONFIG_PKG_USING_OTA_DOWNLOADER is not set # CONFIG_PKG_USING_IPMSG is not set # CONFIG_PKG_USING_LSSDP is not set @@ -647,7 +650,8 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_ARM_2D is not set # CONFIG_PKG_USING_MCUBOOT is not set # CONFIG_PKG_USING_TINYUSB is not set -# CONFIG_PKG_USING_USB_STACK is not set +# CONFIG_PKG_USING_CHERRYUSB is not set +# CONFIG_PKG_USING_KMULTI_RTIMER is not set # # peripheral libraries and drivers @@ -671,6 +675,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set # CONFIG_PKG_USING_INFRARED is not set +# CONFIG_PKG_USING_MULTI_INFRARED is not set # CONFIG_PKG_USING_AGILE_BUTTON is not set # CONFIG_PKG_USING_AGILE_LED is not set # CONFIG_PKG_USING_AT24CXX is not set @@ -727,6 +732,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_SOFT_SERIAL is not set # CONFIG_PKG_USING_MB85RS16 is not set # CONFIG_PKG_USING_CW2015 is not set +# CONFIG_PKG_USING_RFM300 is not set # # AI packages @@ -745,6 +751,10 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # miscellaneous packages # +# +# project laboratory +# + # # samples: kernel and components samples # @@ -777,6 +787,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_CANFESTIVAL is not set # CONFIG_PKG_USING_ZLIB is not set # CONFIG_PKG_USING_MINIZIP is not set +# CONFIG_PKG_USING_HEATSHRINK is not set # CONFIG_PKG_USING_DSTR is not set # CONFIG_PKG_USING_TINYFRAME is not set # CONFIG_PKG_USING_KENDRYTE_DEMO is not set @@ -794,6 +805,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # CONFIG_PKG_USING_DESIGN_PATTERN is not set # CONFIG_PKG_USING_CONTROLLER is not set # CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set +# CONFIG_PKG_USING_MFBD is not set # # Privated Packages of RealThread @@ -852,8 +864,7 @@ CONFIG_RT_LWP_SHM_MAX_NR=64 # RT-Thread Smart # # CONFIG_PKG_USING_UKERNEL is not set -# CONFIG_PKG_USING_UKERNEL_V100 is not set -# CONFIG_PKG_USING_UKERNEL_LATEST_VERSION is not set +# CONFIG_PKG_USING_TRACE_AGENT is not set CONFIG_SOC_IMX6ULL=y CONFIG_CPU_MCIMX6Y2CVM05=y CONFIG_FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 @@ -928,6 +939,10 @@ CONFIG_BSP_USING_PWM1=y # CONFIG_BSP_USING_PWM3 is not set # CONFIG_BSP_USING_PWM4 is not set +# +# Select ADC Driver +# + # # Select WDT Driver # diff --git a/bsp/imx6ull-artpi-smart/.vscode/smart.json b/bsp/imx6ull-artpi-smart/.vscode/smart.json index eaacde0854..c483be5cb1 100644 --- a/bsp/imx6ull-artpi-smart/.vscode/smart.json +++ b/bsp/imx6ull-artpi-smart/.vscode/smart.json @@ -11,7 +11,8 @@ "RTT_CC": "gcc", "RTT_CC_PREFIX": "arm-linux-musleabi-", "RTT_EXEC_PATH": "${SDK_ROOT}/tools/gnu_gcc/arm-linux-musleabi_for_x86_64-pc-linux-gnu/bin", - "PATH": "$PATH:$RTT_EXEC_PATH" + "UDB_PATH": "${SDK_ROOT}/tools/udb-tools/linux", + "PATH": "$PATH:$RTT_EXEC_PATH:$UDB_PATH" } }, "statusBarItem": { @@ -39,7 +40,7 @@ "commands": [ "udb tcp ${SERVER_IP} 5555", "udb devices", - "udb push ${EXECUTABLE_PROGRAM} ${TARGET_PATH}" + "udb push ${EXECUTABLE_PROGRAM} /kernel/kernel.bin" ], "label": "下载", "tooltip": "下载 RT-Thread Smart 工程" @@ -54,4 +55,4 @@ "tooltip": "刷新工程" } } -} \ No newline at end of file +} diff --git a/bsp/imx6ull-artpi-smart/applications/init_em.c b/bsp/imx6ull-artpi-smart/applications/init_em.c new file mode 100644 index 0000000000..d7a5d8fd62 --- /dev/null +++ b/bsp/imx6ull-artpi-smart/applications/init_em.c @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2006-2022, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2022/01/20 bernard the first version + */ + +#include +#include +#include + +#include +#include + +#include +#include + +int em_init(void) +{ + int count = 5; + char *em_cmd = "/bin/em.elf &"; + + while (count --) + { + int fd; + fd = open("/bin/em.elf", O_RDONLY); + if (fd >= 0) + { + close(fd); + + msh_exec(em_cmd, rt_strlen(em_cmd) + 1); + return 0; + } + else + { + rt_thread_mdelay(500); + } + } + + if (count <= 0) + { + printf("open em failed!\n"); + } + + return -1; +} +INIT_APP_EXPORT(em_init); diff --git a/bsp/imx6ull-artpi-smart/applications/main.c b/bsp/imx6ull-artpi-smart/applications/main.c index d83eb62022..71ed99a7e2 100644 --- a/bsp/imx6ull-artpi-smart/applications/main.c +++ b/bsp/imx6ull-artpi-smart/applications/main.c @@ -14,5 +14,6 @@ int main(void) { printf("hello rt-smart\n"); + return 0; } diff --git a/bsp/imx6ull-artpi-smart/applications/mnt.c b/bsp/imx6ull-artpi-smart/applications/mnt.c index bfd8c7d4e8..3190751385 100644 --- a/bsp/imx6ull-artpi-smart/applications/mnt.c +++ b/bsp/imx6ull-artpi-smart/applications/mnt.c @@ -52,6 +52,6 @@ int mnt_init(void) #endif return 0; } -INIT_APP_EXPORT(mnt_init); +INIT_ENV_EXPORT(mnt_init); #endif diff --git a/bsp/imx6ull-artpi-smart/drivers/Kconfig b/bsp/imx6ull-artpi-smart/drivers/Kconfig index 54a8bfa955..ddb6124f0e 100644 --- a/bsp/imx6ull-artpi-smart/drivers/Kconfig +++ b/bsp/imx6ull-artpi-smart/drivers/Kconfig @@ -99,6 +99,7 @@ endmenu menu "Select LCD Driver" config BSP_USING_LCD bool "Enable LCD" + select RT_USING_LCD default y if BSP_USING_LCD @@ -175,6 +176,7 @@ menu "Select ADC Driver" config RT_USING_ADC bool "Enable ADC" default n + if RT_USING_ADC config BSP_USING_ADC1_1 bool "Enable ADC1 CH1" diff --git a/bsp/imx6ull-artpi-smart/drivers/drv_eth.c b/bsp/imx6ull-artpi-smart/drivers/drv_eth.c index 74b3b5b1c2..13679459f8 100644 --- a/bsp/imx6ull-artpi-smart/drivers/drv_eth.c +++ b/bsp/imx6ull-artpi-smart/drivers/drv_eth.c @@ -142,13 +142,13 @@ void imx6ul_eth_link_change(struct rt_imx6ul_ethps *imx6ul_device,rt_bool_t up) { if(up) { - LOG_D("enet%d link up\n",imx6ul_device->mac_num); + LOG_D("enet%d link up",imx6ul_device->mac_num); eth_device_linkchange(&imx6ul_device->parent, RT_TRUE); imx6ul_device->phy_link_status = RT_TRUE; } else { - LOG_D("enet%d link down\n",imx6ul_device->mac_num); + LOG_D("enet%d link down",imx6ul_device->mac_num); eth_device_linkchange(&imx6ul_device->parent, RT_FALSE); imx6ul_device->phy_link_status = RT_FALSE; } @@ -170,13 +170,13 @@ rt_err_t enet_buffer_init(enet_buffer_config_t *buffConfig) if(((SYS_PAGE_SIZE<rxBufferTotalSize)|| ((SYS_PAGE_SIZE<txBufferTotalSize)) { - LOG_E("ERROR: alloc mem not enough for enet driver\n"); + LOG_E("ERROR: alloc mem not enough for enet driver"); return RT_ERROR; } rx_buff_addr = rt_pages_alloc(RX_BUFFER_INDEX_NUM); if(!rx_buff_addr) { - LOG_E("ERROR: rx buff page alloc failed\n"); + LOG_E("ERROR: rx buff page alloc failed"); return RT_ERROR; } buffConfig->rxBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_buff_addr), (SYS_PAGE_SIZE<txBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_buff_addr), (SYS_PAGE_SIZE<rxBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_bd_addr), (SYS_PAGE_SIZE<txBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_bd_addr), (SYS_PAGE_SIZE< ENET_FRAME_MAX_FRAMELEN) { - LOG_E("net error send length %d exceed max length\n",offset); + LOG_E("net error send length %d exceed max length",offset); } return ret; } @@ -416,7 +416,7 @@ struct pbuf *rt_imx6ul_eth_rx(rt_device_t dev) } if(length > ENET_FRAME_MAX_FRAMELEN) { - LOG_E("net error recv length %d exceed max length\n",length); + LOG_E("net error recv length %d exceed max length",length); return RT_NULL; } pbuf_realloc(p, length); @@ -448,7 +448,7 @@ void rx_enet_callback(void *base) instance = get_instance_by_base(base); if(instance == -1) { - LOG_E("interrput match base addr error \n"); + LOG_E("interrput match base addr error"); return; } eth_device_ready(&(_imx6ul_eth_device[instance].parent)); @@ -483,7 +483,7 @@ static void phy_detect_thread_entry(void *param) } else { - LOG_E("\r\nPHY Link down, please check the cable connection and link partner setting.\r\n"); + LOG_E("PHY Link down, please check the cable connection and link partner setting."); } while(1) @@ -533,7 +533,7 @@ static int imx6ul_eth_init(void) state = eth_device_init(&(_imx6ul_eth_device[idx].parent), _imx6ul_eth_device[idx].mac_name); if (RT_EOK == state) { - LOG_E("emac device init success\n"); + LOG_E("emac device init success"); } else { @@ -560,4 +560,4 @@ static int imx6ul_eth_init(void) return state; } INIT_DEVICE_EXPORT(imx6ul_eth_init); -#endif \ No newline at end of file +#endif diff --git a/bsp/imx6ull-artpi-smart/drivers/drv_lcd.c b/bsp/imx6ull-artpi-smart/drivers/drv_lcd.c index 6513bb1d88..c159e47bca 100644 --- a/bsp/imx6ull-artpi-smart/drivers/drv_lcd.c +++ b/bsp/imx6ull-artpi-smart/drivers/drv_lcd.c @@ -12,7 +12,6 @@ #include #include -#include #ifdef BSP_USING_LCD @@ -22,7 +21,6 @@ #include "fsl_iomuxc.h" #include "drv_lcd.h" #include -#include "rt_lcd.h" static struct imx6ull_lcd_config _lcd_config = LCD_BUS_CONFIG; static struct imx6ull_lcd_bus _lcd_obj; diff --git a/bsp/imx6ull-artpi-smart/rtconfig.h b/bsp/imx6ull-artpi-smart/rtconfig.h index 6b7b0fd210..fe997486d5 100644 --- a/bsp/imx6ull-artpi-smart/rtconfig.h +++ b/bsp/imx6ull-artpi-smart/rtconfig.h @@ -119,6 +119,7 @@ #define RT_USING_SERIAL #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_TTY +#define RT_USING_CPUTIME #define RT_USING_I2C #define RT_USING_PIN #define RT_USING_NULL @@ -135,6 +136,7 @@ #define RT_USING_SPI #define RT_USING_WDT #define RT_USING_TOUCH +#define RT_USING_LCD /* Using USB */ @@ -312,6 +314,8 @@ /* miscellaneous packages */ +/* project laboratory */ + /* samples: kernel and components samples */ @@ -375,6 +379,8 @@ #define BSP_USING_PWM1 +/* Select ADC Driver */ + /* Select WDT Driver */ #define RT_USING_WDT1 diff --git a/components/libc/compilers/common/time.c b/components/libc/compilers/common/time.c index 99dab71eb4..f8db1f5055 100644 --- a/components/libc/compilers/common/time.c +++ b/components/libc/compilers/common/time.c @@ -10,6 +10,7 @@ */ #include +#include #include #if !defined (__IAR_SYSTEMS_ICC__) -- Gitee