diff options
| author | Bernard Xiong <[email protected]> | 2019-05-29 18:06:41 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-05-29 18:06:41 +0800 |
| commit | 6e353e688fcc720fef1243d61a1281dfcb96fbc8 (patch) | |
| tree | e8a5ff6bfd3b02ef4cfc9176e6fc5c7ec972b8e4 /bsp | |
| parent | c45f2f4cbcdef5e75395f969bf5ee44a5036f2e2 (diff) | |
| parent | 74874fea42830da9517d355169cd6aac731c5f15 (diff) | |
Merge pull request #2738 from armink/fix_drivers
Fix drivers
Diffstat (limited to 'bsp')
| -rw-r--r-- | bsp/allwinner_tina/drivers/spi/drv_spi_flash.c | 10 | ||||
| -rw-r--r-- | bsp/gd32450z-eval/drivers/drv_spi_flash.c | 16 | ||||
| -rw-r--r-- | bsp/nuvoton_m487/.config | 58 | ||||
| -rw-r--r-- | bsp/nuvoton_m487/driver/drv_spiflash.c | 16 | ||||
| -rw-r--r-- | bsp/nuvoton_m487/rtconfig.h | 17 |
5 files changed, 57 insertions, 60 deletions
diff --git a/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c b/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c index e507859928..7aecc5411d 100644 --- a/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c +++ b/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c @@ -63,16 +63,6 @@ int rt_hw_spi_flash_with_sfud_init(void) } INIT_PREV_EXPORT(rt_hw_spi_flash_with_sfud_init); -#elif defined(RT_USING_W25QXX) -#include "spi_flash_w25qxx.h" - -int rt_hw_spi_flash_init(void) -{ - DEBUG_PRINTF("%s -> %d\n", __FUNCTION__, __LINE__); - return w25qxx_init(SPI_FLASH_CHIP, SPI_FLASH_DEVICE_NAME); -} -INIT_DEVICE_EXPORT(rt_hw_spi_flash_init); - #endif #endif
\ No newline at end of file diff --git a/bsp/gd32450z-eval/drivers/drv_spi_flash.c b/bsp/gd32450z-eval/drivers/drv_spi_flash.c index b55bb9d8ce..9b60753472 100644 --- a/bsp/gd32450z-eval/drivers/drv_spi_flash.c +++ b/bsp/gd32450z-eval/drivers/drv_spi_flash.c @@ -20,17 +20,9 @@ #include "spi_flash_sfud.h" #endif -#ifdef RT_USING_W25QXX -#include "spi_flash_w25qxx.h" -#endif - #include <rthw.h> #include <finsh.h> -#if defined(RT_USING_SFUD) && defined(RT_USING_W25QXX) -#error "RT_USING_SFUD and RT_USING_W25QXX only need one" -#endif - #define SPI_PERIPH SPI5 #define SPI_BUS_NAME "spi5" #define SPI_FLASH_DEVICE_NAME "spi50" @@ -95,11 +87,3 @@ static int rt_hw_spi_flash_with_sfud_init(void) } INIT_COMPONENT_EXPORT(rt_hw_spi_flash_with_sfud_init) #endif - -#ifdef RT_USING_W25QXX -static int rt_hw_spi_flash_init(void) -{ - return w25qxx_init(SPI_FLASH_CHIP, SPI_FLASH_DEVICE_NAME); -} -INIT_COMPONENT_EXPORT(rt_hw_spi_flash_init) -#endif diff --git a/bsp/nuvoton_m487/.config b/bsp/nuvoton_m487/.config index 85c0c1c114..2e97e2c885 100644 --- a/bsp/nuvoton_m487/.config +++ b/bsp/nuvoton_m487/.config @@ -64,7 +64,8 @@ CONFIG_RT_USING_DEVICE=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" -CONFIG_RT_VER_NUM=0x40001 +CONFIG_RT_VER_NUM=0x40002 +# CONFIG_RT_USING_CPU_FFS is not set # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set # @@ -137,6 +138,7 @@ CONFIG_RT_USING_DFS_DEVFS=y # CONFIG_RT_USING_DEVICE_IPC=y CONFIG_RT_PIPE_BUFSZ=64 +# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set CONFIG_RT_USING_SERIAL=y CONFIG_RT_SERIAL_USING_DMA=y CONFIG_RT_SERIAL_RB_BUFSZ=64 @@ -156,9 +158,11 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64 CONFIG_RT_USING_SPI=y # CONFIG_RT_USING_QSPI is not set # CONFIG_RT_USING_SPI_MSD is not set -# CONFIG_RT_USING_SFUD is not set -CONFIG_RT_USING_W25QXX=y -# CONFIG_RT_USING_GD is not set +CONFIG_RT_USING_SFUD=y +CONFIG_RT_SFUD_USING_SFDP=y +CONFIG_RT_SFUD_USING_FLASH_INFO_TABLE=y +# CONFIG_RT_SFUD_USING_QSPI is not set +# CONFIG_RT_DEBUG_SFUD is not set # CONFIG_RT_USING_ENC28J60 is not set # CONFIG_RT_USING_SPI_WIFI is not set # CONFIG_RT_USING_WDT is not set @@ -166,6 +170,11 @@ CONFIG_RT_USING_W25QXX=y # CONFIG_RT_USING_SENSOR is not set # +# Using Hardware Crypto drivers +# +# CONFIG_RT_USING_HWCRYPTO is not set + +# # Using WiFi # # CONFIG_RT_USING_WIFI is not set @@ -197,6 +206,12 @@ CONFIG_RT_USING_POSIX=y # CONFIG_RT_USING_SAL is not set # +# Network interface device +# +# CONFIG_RT_USING_NETDEV is not set +CONFIG_NETDEV_USING_PING=y + +# # light weight TCP/IP stack # CONFIG_RT_USING_LWIP=y @@ -240,6 +255,7 @@ CONFIG_RT_LWIP_ETHTHREAD_STACKSIZE=768 CONFIG_RT_LWIP_ETHTHREAD_MBOX_SIZE=8 # CONFIG_RT_LWIP_REASSEMBLY_FRAG is not set CONFIG_LWIP_NETIF_STATUS_CALLBACK=1 +CONFIG_LWIP_NETIF_LINK_CALLBACK=1 CONFIG_SO_REUSE=1 CONFIG_LWIP_SO_RCVTIMEO=1 CONFIG_LWIP_SO_SNDTIMEO=1 @@ -248,6 +264,7 @@ CONFIG_LWIP_SO_RCVBUF=1 CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_RT_LWIP_STATS is not set # CONFIG_RT_LWIP_USING_HW_CHECKSUM is not set +CONFIG_RT_LWIP_USING_PING=y # CONFIG_RT_LWIP_DEBUG is not set # @@ -269,7 +286,6 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # # Utilities # -# CONFIG_RT_USING_LOGTRACE is not set # CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set @@ -311,6 +327,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_PKG_USING_NOPOLL is not set # CONFIG_PKG_USING_NETUTILS is not set # CONFIG_PKG_USING_AT_DEVICE is not set +# CONFIG_PKG_USING_ATSRV_SOCKET is not set # CONFIG_PKG_USING_WIZNET is not set # @@ -323,6 +340,9 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_PKG_USING_TENCENT_IOTKIT is not set # CONFIG_PKG_USING_NIMBLE 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 +# CONFIG_PKG_USING_AIRKISS_OPEN is not set # # security packages @@ -343,6 +363,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # # CONFIG_PKG_USING_OPENMV is not set # CONFIG_PKG_USING_MUPDF is not set +# CONFIG_PKG_USING_STEMWIN is not set # # tools packages @@ -371,35 +392,32 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_PKG_USING_CMSIS is not set # CONFIG_PKG_USING_DFS_YAFFS is not set # CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_THREAD_POOL is not set # # peripheral libraries and drivers # - -# -# sensors drivers -# -# CONFIG_PKG_USING_LSM6DSL is not set -# CONFIG_PKG_USING_LPS22HB is not set -# CONFIG_PKG_USING_HTS221 is not set -# CONFIG_PKG_USING_LSM303AGR is not set -# CONFIG_PKG_USING_BME280 is not set -# CONFIG_PKG_USING_BMA400 is not set -# CONFIG_PKG_USING_BMI160_BMX160 is not set -# CONFIG_PKG_USING_SPL0601 is not set +# CONFIG_PKG_USING_SENSORS_DRIVERS is not set # CONFIG_PKG_USING_REALTEK_AMEBA is not set # CONFIG_PKG_USING_SHT2X is not set -# CONFIG_PKG_USING_AHT10 is not set # CONFIG_PKG_USING_AP3216C is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set # CONFIG_PKG_USING_U8G2 is not set # CONFIG_PKG_USING_BUTTON is not set -# CONFIG_PKG_USING_MPU6XXX is not set # CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_SX12XX is not set # CONFIG_PKG_USING_SIGNAL_LED is not set +# CONFIG_PKG_USING_LEDBLINK is not set +# 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_ROSSERIAL is not set +# CONFIG_PKG_USING_AT24CXX is not set +# CONFIG_PKG_USING_MOTIONDRIVER2RTT is not set +# CONFIG_PKG_USING_AD7746 is not set +# CONFIG_PKG_USING_PCA9685 is not set +# CONFIG_PKG_USING_I2C_TOOLS is not set # # miscellaneous packages @@ -415,6 +433,7 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_PKG_USING_DSTR is not set # CONFIG_PKG_USING_TINYFRAME is not set # CONFIG_PKG_USING_KENDRYTE_DEMO is not set +# CONFIG_PKG_USING_DIGITALCTRL is not set # # samples: kernel and components samples @@ -425,3 +444,4 @@ CONFIG_LWIP_NETIF_LOOPBACK=0 # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set # CONFIG_PKG_USING_HELLO is not set # CONFIG_PKG_USING_VI is not set +# CONFIG_PKG_USING_NNOM is not set diff --git a/bsp/nuvoton_m487/driver/drv_spiflash.c b/bsp/nuvoton_m487/driver/drv_spiflash.c index 59aa650a93..488df7ba42 100644 --- a/bsp/nuvoton_m487/driver/drv_spiflash.c +++ b/bsp/nuvoton_m487/driver/drv_spiflash.c @@ -11,11 +11,9 @@ #include <rtdevice.h> #ifdef RT_USING_SPI -#if defined(RT_USING_W25QXX) || defined(RT_USING_SFUD) + +#if defined(RT_USING_SFUD) static struct rt_spi_device spi_device; -#ifdef RT_USING_W25QXX - #include "spi_flash_w25qxx.h" -#elif defined(RT_USING_SFUD) #include "spi_flash.h" #include "spi_flash_sfud.h" #endif @@ -25,11 +23,7 @@ static int rt_hw_spi_flash_init(void) { rt_spi_bus_attach_device(&spi_device, "qspi01", "qspi0", RT_NULL); -#ifdef RT_USING_W25QXX - - return w25qxx_init("flash0", "qspi01"); - -#elif defined(RT_USING_SFUD) +#if defined(RT_USING_SFUD) if (rt_sfud_flash_probe("flash0", "qspi01") == RT_NULL) { @@ -40,6 +34,6 @@ static int rt_hw_spi_flash_init(void) } INIT_COMPONENT_EXPORT(rt_hw_spi_flash_init); -#endif -#endif + +#endif /* RT_USING_SPI */ diff --git a/bsp/nuvoton_m487/rtconfig.h b/bsp/nuvoton_m487/rtconfig.h index e0b098900d..379bc4f303 100644 --- a/bsp/nuvoton_m487/rtconfig.h +++ b/bsp/nuvoton_m487/rtconfig.h @@ -37,7 +37,7 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40001 +#define RT_VER_NUM 0x40002 /* RT-Thread Components */ @@ -93,7 +93,12 @@ #define RT_SERIAL_USING_DMA #define RT_SERIAL_RB_BUFSZ 64 #define RT_USING_SPI -#define RT_USING_W25QXX +#define RT_USING_SFUD +#define RT_SFUD_USING_SFDP +#define RT_SFUD_USING_FLASH_INFO_TABLE + +/* Using Hardware Crypto drivers */ + /* Using WiFi */ @@ -111,6 +116,10 @@ /* Socket abstraction layer */ +/* Network interface device */ + +#define NETDEV_USING_PING + /* light weight TCP/IP stack */ #define RT_USING_LWIP @@ -145,11 +154,13 @@ #define RT_LWIP_ETHTHREAD_STACKSIZE 768 #define RT_LWIP_ETHTHREAD_MBOX_SIZE 8 #define LWIP_NETIF_STATUS_CALLBACK 1 +#define LWIP_NETIF_LINK_CALLBACK 1 #define SO_REUSE 1 #define LWIP_SO_RCVTIMEO 1 #define LWIP_SO_SNDTIMEO 1 #define LWIP_SO_RCVBUF 1 #define LWIP_NETIF_LOOPBACK 0 +#define RT_LWIP_USING_PING /* Modbus master and slave stack */ @@ -196,8 +207,6 @@ /* peripheral libraries and drivers */ -/* sensors drivers */ - /* miscellaneous packages */ |
