Merge pull request #2738 from armink/fix_drivers

Fix drivers

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

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

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,15 +158,22 @@ 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
 # CONFIG_RT_USING_AUDIO is not set
 # CONFIG_RT_USING_SENSOR is not set
 
+#
+# Using Hardware Crypto drivers
+#
+# CONFIG_RT_USING_HWCRYPTO is not set
+
 #
 # Using WiFi
 #
@@ -196,6 +205,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
 #
@@ -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

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 */
 

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 */
 

components/drivers/Kconfig

@@ -212,6 +212,9 @@ config RT_USING_SPI
         config RT_USING_SFUD
             bool "Using Serial Flash Universal Driver"
             default n
+            help
+                An using JEDEC's SFDP standard serial (SPI) flash universal driver library
+
             if RT_USING_SFUD
                 config RT_SFUD_USING_SFDP
                 bool "Using auto probe flash JEDEC SFDP parameter"
@@ -231,14 +234,6 @@ config RT_USING_SPI
                 default n
             endif
 
-        config RT_USING_W25QXX
-            bool "Using W25QXX SPI NorFlash"
-            default n
-
-        config RT_USING_GD
-            bool "Using GD SPI NorFlash"
-            default n
-
         config RT_USING_ENC28J60
             bool "Using ENC28J60 SPI Ethernet network interface"
             select RT_USING_LWIP

components/drivers/i2c/fm24clxx.c

@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2017-07-14     aubr.cool    1st version
- */
-#include <rtthread.h>
-#include <rtdevice.h>
-#include "fm24clxx.h"
-
-struct fm24clxx_device
-{
-    struct rt_device         parent;
-    struct rt_i2c_bus_device *bus;
-};
-
-/* RT-Thread device interface */
-
-static rt_err_t fm24clxx_init(rt_device_t dev)
-{
-    return RT_EOK;
-}
-static rt_err_t fm24clxx_open(rt_device_t dev, rt_uint16_t oflag)
-{
-    return RT_EOK;
-}
-
-static rt_err_t fm24clxx_close(rt_device_t dev)
-{
-    return RT_EOK;
-}
-
-static rt_err_t fm24clxx_control(rt_device_t dev, int cmd, void *args)
-{
-    return RT_EOK;
-}
-
-static rt_size_t fm24clxx_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
-{
-    struct fm24clxx_device *fm24clxx;
-    const struct fm24clxx_config *cfg;
-    struct rt_i2c_msg msg[2];
-    rt_uint8_t mem_addr[2] = {0,};
-    rt_size_t ret = 0;
-    RT_ASSERT(dev != 0);
-
-    fm24clxx = (struct fm24clxx_device *) dev;
-
-    RT_ASSERT(fm24clxx->parent.user_data != 0);
-    cfg = (const struct fm24clxx_config *) fm24clxx->parent.user_data;
-
-    if(pos > cfg->size)
-    {
-         return 0;
-    }
-
-    if(pos + size > cfg->size)
-    {
-         size = cfg->size - pos;
-    }
-
-    msg[0].addr     = cfg->addr;
-    msg[0].flags    = cfg->flags | RT_I2C_WR;
-    mem_addr[0]     = (pos >> 8);
-    mem_addr[1]     = (rt_uint8_t) pos;
-    msg[0].buf      = (rt_uint8_t *) mem_addr;
-    msg[0].len      =  2;
-
-    msg[1].addr     = cfg->addr;
-    msg[1].flags    = cfg->flags | RT_I2C_RD;
-    msg[1].buf      = (rt_uint8_t *) buffer;
-    msg[1].len      = size;
-
-    ret = rt_i2c_transfer(fm24clxx->bus, msg, 2);
-    return (ret == 2) ? size : 0;
-}
-
-static rt_size_t fm24clxx_write(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
-{
-    struct fm24clxx_device *fm24clxx;
-    const struct fm24clxx_config *cfg;
-    struct rt_i2c_msg msg[2];
-    rt_uint8_t mem_addr[2] = {0,};
-    rt_size_t ret = 0;
-    RT_ASSERT(dev != 0);
-
-    fm24clxx = (struct fm24clxx_device *) dev;
-
-    RT_ASSERT(fm24clxx->parent.user_data != 0);
-    cfg = (const struct fm24clxx_config *) fm24clxx->parent.user_data;
-
-    if(pos > cfg->size)
-    {
-         return 0;
-    }
-
-    if(pos + size > cfg->size)
-    {
-         size = cfg->size - pos;
-    }
-
-    msg[0].addr     = cfg->addr;
-    msg[0].flags    = cfg->flags | RT_I2C_WR;
-    mem_addr[0]     = (pos >> 8);
-    mem_addr[1]     = (rt_uint8_t) pos;
-    msg[0].buf      = (rt_uint8_t *) mem_addr;
-    msg[0].len      =  2;
-
-    msg[1].addr     = cfg->addr;
-    msg[1].flags    = cfg->flags | RT_I2C_WR | RT_I2C_NO_START;
-    msg[1].buf      = (rt_uint8_t *) buffer;
-    msg[1].len      = size;
-
-    ret = rt_i2c_transfer(fm24clxx->bus, msg, 2);
-    return (ret == 2) ? size : 0;
-}
-
-#ifdef RT_USING_DEVICE_OPS
-const static struct rt_device fm24clxx_ops =
-{
-    fm24clxx_init,
-    fm24clxx_open,
-    fm24clxx_close,
-    fm24clxx_read,
-    fm24clxx_write,
-    fm24clxx_control
-};
-#endif
-
-rt_err_t fm24clxx_register(const char *fm_device_name, const char *i2c_bus, void *user_data)
-{
-    static struct fm24clxx_device fm24clxx_drv;
-    struct rt_i2c_bus_device *bus;
-
-    bus = rt_i2c_bus_device_find(i2c_bus);
-    if (bus == RT_NULL)
-    {
-        return RT_ENOSYS;
-    }
-
-    fm24clxx_drv.bus = bus;
-    fm24clxx_drv.parent.type      = RT_Device_Class_Block;
-#ifdef RT_USING_DEVICE_OPS
-    fm24clxx_drv.parent.ops       = &fm24clxx_ops;
-#else
-    fm24clxx_drv.parent.init      = fm24clxx_init;
-    fm24clxx_drv.parent.open      = fm24clxx_open;
-    fm24clxx_drv.parent.close     = fm24clxx_close;
-    fm24clxx_drv.parent.read      = fm24clxx_read;
-    fm24clxx_drv.parent.write     = fm24clxx_write;
-    fm24clxx_drv.parent.control   = fm24clxx_control;
-#endif
-
-    fm24clxx_drv.parent.user_data = user_data;
-
-    return rt_device_register(&fm24clxx_drv.parent, fm_device_name, RT_DEVICE_FLAG_RDWR);
-}

components/drivers/i2c/fm24clxx.h

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2017-07-14     aubr.cool    1st version
- */
-
-#ifndef __FM24CLXX_H__
-#define __FM24CLXX_H__
-
-#include <rtthread.h>
-
-struct fm24clxx_config
-{
-    rt_uint32_t              size;
-    rt_uint16_t              addr;
-    rt_uint16_t              flags;
-};
-
-extern rt_err_t fm24clxx_register(const char *e2m_device_name,
-                                  const char *i2c_bus, void *user_data);
-
-#endif /*__FM24CLXX_H__*/

components/drivers/spi/SConscript

@@ -14,24 +14,9 @@ src_device = []
 if GetDepend('RT_USING_SPI_WIFI'):
     src_device += ['spi_wifi_rw009.c']
 
-if GetDepend('RT_USING_W25QXX'):
-    src_device += ['spi_flash_w25qxx.c']
-    
-if GetDepend('RT_USING_W25QXX_MTD'):
-    src_device += ['spi_flash_w25qxx_mtd.c']    
-    
 if GetDepend('RT_USING_ENC28J60'):
     src_device += ['enc28j60.c']
 
-if GetDepend('RT_USING_AT45DBXX'):
-    src_device += ['spi_flash_at45dbxx.c']
-
-if GetDepend('RT_USING_SST25VFXX'):
-    src_device += ['spi_flash_sst25vfxx.c']
-
-if GetDepend('RT_USING_GD'):
-    src_device += ['spi_flash_gd.c']
-
 if GetDepend('RT_USING_SPI_MSD'):
     src_device += ['spi_msd.c']
 

components/drivers/spi/device_driver_list.txt

@@ -5,11 +5,5 @@ http://www.rt-thread.com/
 enc28j60.c/enc28j60.h
 http://www.microchip.com/
 
-spi_flash_at45dbxx.c/spi_flash_at45dbxx.h
-http://www.atmel.com/
-
-spi_flash_sst25vfxx.c/spi_flash_sst25vfxx.h
-http://www.microchip.com/
-
-spi_flash_w25qxx.c/spi_flash_w25qxx.h
-http://www.winbond.com/
+spi_flash_sfud: Serial Flash Universal Driver
+https://github.com/armink/SFUD

components/drivers/spi/spi_flash_at45dbxx.h

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-12-16     aozima       the first version
- */
-
-#ifndef SPI_FLASH_AT45DBXX_H_INCLUDED
-#define SPI_FLASH_AT45DBXX_H_INCLUDED
-
-#include <rtthread.h>
-#include <drivers/spi.h>
-
-struct spi_flash_at45dbxx
-{
-    struct rt_device                flash_device;
-    struct rt_device_blk_geometry   geometry;
-    struct rt_spi_device *          rt_spi_device;
-};
-
-extern rt_err_t at45dbxx_init(const char * flash_device_name, const char * spi_device_name);
-
-
-#endif // SPI_FLASH_AT45DBXX_H_INCLUDED

components/drivers/spi/spi_flash_gd.h

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2015-10-11     fullhan      copy from winbond flash
- */
-
-#ifndef SPI_FLASH_GD_H_
-#define SPI_FLASH_GD_H_
-
-#include <rtthread.h>
-
-extern rt_err_t gd_init(const char * flash_device_name, const char * spi_device_name);
-
-#endif /* SPI_FLASH_GD_H_ */

components/drivers/spi/spi_flash_sst25vfxx.h

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-12-16     aozima      the first version
- */
-
-#ifndef SPI_FLASH_SST25VFXX_H_INCLUDED
-#define SPI_FLASH_SST25VFXX_H_INCLUDED
-
-#include <rtthread.h>
-#include <drivers/spi.h>
-
-struct spi_flash_sst25vfxx
-{
-    struct rt_device                flash_device;
-    struct rt_device_blk_geometry   geometry;
-    struct rt_spi_device *          rt_spi_device;
-    struct rt_mutex                 lock;
-};
-
-extern rt_err_t sst25vfxx_init(const char * flash_device_name, const char * spi_device_name);
-
-
-#endif // SPI_FLASH_SST25VFXX_H_INCLUDED

components/drivers/spi/spi_flash_w25qxx.h

@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-12-16     aozima      the first version
- * 2012-08-23     aozima       add flash lock.
- */
-
-#ifndef SPI_FLASH_W25QXX_H_INCLUDED
-#define SPI_FLASH_W25QXX_H_INCLUDED
-
-#include <rtthread.h>
-
-extern rt_err_t w25qxx_init(const char * flash_device_name,
-                            const char * spi_device_name);
-
-#endif // SPI_FLASH_W25QXX_H_INCLUDED

components/drivers/spi/spi_flash_w25qxx_mtd.h

@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-12-16     aozima      the first version
- * 2012-08-23     aozima       add flash lock.
- * 2017-02-11     urey				add mtd fucntion
- */
-
-#ifndef SPI_FLASH_W25QXX_H_INCLUDED
-#define SPI_FLASH_W25QXX_H_INCLUDED
-
-#include <rtthread.h>
-
-extern rt_err_t w25qxx_mtd_init(const char *mtd_name,const char * spi_device_name);
-
-#endif // SPI_FLASH_W25QXX_H_INCLUDED