From 5af908596659f7f0f18b4ab2bff66bb9384ba9e5 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 18 Mar 2021 15:07:09 +0800 Subject: [PATCH] [nuvoton] Fix ordering and configuration. 1. Update module starting ordering. 2. Fix QSPI PDMA configuration. --- bsp/nuvoton/libraries/m2354/rtt_port/drv_softi2c.c | 2 +- bsp/nuvoton/libraries/m480/rtt_port/drv_softi2c.c | 2 +- bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig | 13 +++++++++---- bsp/nuvoton/libraries/nuc980/rtt_port/drv_softi2c.c | 2 +- bsp/nuvoton/nk-980iot/applications/mnt.c | 2 +- bsp/nuvoton/nk-rtu980/applications/mnt.c | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_softi2c.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_softi2c.c index a2a7ac7cc5..0d2039a563 100644 --- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_softi2c.c +++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_softi2c.c @@ -212,6 +212,6 @@ int rt_soft_i2c_init(void) return 0; } -INIT_BOARD_EXPORT(rt_soft_i2c_init); +INIT_DEVICE_EXPORT(rt_soft_i2c_init); #endif //#if (defined(BSP_USING_SOFT_I2C) && defined(BSP_USING_GPIO) && defined(RT_USING_I2C_BITOPS) && defined(RT_USING_I2C) && defined(RT_USING_PIN)) diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_softi2c.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_softi2c.c index 1549bf57f2..54208fbd61 100644 --- a/bsp/nuvoton/libraries/m480/rtt_port/drv_softi2c.c +++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_softi2c.c @@ -212,6 +212,6 @@ int rt_soft_i2c_init(void) return 0; } -INIT_BOARD_EXPORT(rt_soft_i2c_init); +INIT_DEVICE_EXPORT(rt_soft_i2c_init); #endif //#if (defined(BSP_USING_SOFT_I2C) && defined(BSP_USING_GPIO) && defined(RT_USING_I2C_BITOPS) && defined(RT_USING_I2C) && defined(RT_USING_PIN)) diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig b/bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig index e7293b535d..08ea27c97a 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/Kconfig @@ -472,12 +472,17 @@ config SOC_SERIES_NUC980 select BSP_USING_SPI if BSP_USING_QSPI - config BSP_USING_QSPI0 - bool "Enable QSPI0" + config BSP_USING_QSPI_PDMA + bool + select BSP_USING_SPI_PDMA + default n - config BSP_USING_QSPI0_PDMA + config BSP_USING_QSPI0 + bool "Enable QSPI0" + + config BSP_USING_QSPI0_PDMA bool "Enable PDMA for QSPI0" - select BSP_USING_SPI_PDMA + select BSP_USING_QSPI_PDMA depends on BSP_USING_QSPI0 endif diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_softi2c.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_softi2c.c index f638c51ff6..adc62cb4c1 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_softi2c.c +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_softi2c.c @@ -224,6 +224,6 @@ int rt_soft_i2c_init(void) return 0; } -INIT_BOARD_EXPORT(rt_soft_i2c_init); +INIT_DEVICE_EXPORT(rt_soft_i2c_init); #endif //#if (defined(BSP_USING_SOFT_I2C) && defined(RT_USING_I2C_BITOPS) && defined(RT_USING_I2C) && defined(RT_USING_PIN)) diff --git a/bsp/nuvoton/nk-980iot/applications/mnt.c b/bsp/nuvoton/nk-980iot/applications/mnt.c index 746d1e9a36..4ff5b1f252 100644 --- a/bsp/nuvoton/nk-980iot/applications/mnt.c +++ b/bsp/nuvoton/nk-980iot/applications/mnt.c @@ -235,6 +235,6 @@ exit_mnt_init_spiflash0: return 0; } -INIT_ENV_EXPORT(mnt_init_spiflash0); +INIT_APP_EXPORT(mnt_init_spiflash0); #endif diff --git a/bsp/nuvoton/nk-rtu980/applications/mnt.c b/bsp/nuvoton/nk-rtu980/applications/mnt.c index 779db2ffe8..ecfc390243 100644 --- a/bsp/nuvoton/nk-rtu980/applications/mnt.c +++ b/bsp/nuvoton/nk-rtu980/applications/mnt.c @@ -232,6 +232,6 @@ exit_mnt_init_spiflash0: return 0; } -INIT_ENV_EXPORT(mnt_init_spiflash0); +INIT_APP_EXPORT(mnt_init_spiflash0); #endif