From 03a47a5fbd15d9ea14e102bc70ac0819eca72b98 Mon Sep 17 00:00:00 2001 From: kyChu Date: Thu, 21 Nov 2019 12:10:49 +0000 Subject: [PATCH] Merged in kyChuGit/nuttx/driver_update (pull request #1073) Driver update * drivers/mtd/Make.defs: Add MTD driver for QuadSPI-based Winbond NOR FLASH * stm32l4/stm32l4_qspi.c: the "QSPI_DMA_PRIO" has been defined above Approved-by: Gregory Nutt --- arch/arm/src/stm32l4/stm32l4_qspi.c | 6 ------ drivers/mtd/Make.defs | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index fd4049ef2b0..06cfba52f92 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -292,12 +292,6 @@ static int qspi0_interrupt(int irq, void *context, FAR void *arg); #ifdef CONFIG_STM32L4_QSPI_DMA -# if defined(CONFIG_QSPI_DMAPRIO) -# define QSPI_DMA_PRIO CONFIG_QSPI_DMAPRIO -# else -# define QSPI_DMA_PRIO DMA_CCR_PRIMED -# endif - # ifdef CONFIG_STM32L4_QSPI_DMADEBUG # define qspi_dma_sample(s,i) stm32l4_dmasample((s)->dmach, &(s)->dmaregs[i]) static void qspi_dma_sampleinit(struct stm32l4_qspidev_s *priv); diff --git a/drivers/mtd/Make.defs b/drivers/mtd/Make.defs index 2360decee4c..5a2329fbb74 100644 --- a/drivers/mtd/Make.defs +++ b/drivers/mtd/Make.defs @@ -140,6 +140,10 @@ ifeq ($(CONFIG_MTD_N25QXXX),y) CSRCS += n25qxxx.c endif +ifeq ($(CONFIG_MTD_W25QXXXJV),y) +CSRCS += w25qxxxjv.c +endif + ifeq ($(CONFIG_MTD_MX25RXX),y) CSRCS += mx25rxx.c endif