You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/10/26 02:45:28 UTC
[incubator-nuttx] branch master updated (3724f6b -> c9d784a)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 3724f6b lib/netdb: Change the default NETDB_DNSCLIENT_NAMESIZE to NAME_MAX
new fb00ab3 xtensa/esp32: Rename MTD-related configs to become more intuitive
new 06bb85d risc-v/esp32c3: Rename MTD-related configs to become more intuitive
new 18f785c risc-v/esp32c3: Removed unused definitions
new de0e4d4 xtensa/esp32s2: Rename MTD-related configs to become more intuitive
new c9d784a boards/esp32c3-devkit: Port SPI Flash FS fixes from ESP32
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/risc-v/src/esp32c3/Kconfig | 10 ++---
arch/xtensa/src/esp32/Kconfig | 10 ++---
arch/xtensa/src/esp32s2/Kconfig | 10 ++---
boards/risc-v/esp32c3/esp32c3-devkit/Kconfig | 46 ++++++++++++----------
.../esp32c3-devkit/configs/spiflash/defconfig | 7 ++--
.../esp32c3-devkit/configs/sta_softap/defconfig | 6 +--
.../esp32c3/esp32c3-devkit/src/esp32c3_bringup.c | 3 --
.../esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c | 4 +-
.../xtensa/esp32/common/src/esp32_board_spiflash.c | 4 +-
.../esp32/esp32-devkitc/configs/autopm/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +-
.../esp32-devkitc/configs/sta_softap/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi_smp/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wifinsh/defconfig | 2 +-
.../esp32-ethernet-kit/configs/autopm/defconfig | 2 +-
.../esp32-ethernet-kit/configs/wapi/defconfig | 2 +-
.../esp32-wrover-kit/configs/autopm/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/wapi/defconfig | 2 +-
20 files changed, 62 insertions(+), 60 deletions(-)
[incubator-nuttx] 04/05: xtensa/esp32s2: Rename MTD-related configs
to become more intuitive
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit de0e4d4aac84df3d2c9de9b58b08dc1f966f4acd
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Mon Oct 25 14:45:59 2021 -0300
xtensa/esp32s2: Rename MTD-related configs to become more intuitive
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/esp32s2/Kconfig | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig
index 1f4ba73..daaf2db 100644
--- a/arch/xtensa/src/esp32s2/Kconfig
+++ b/arch/xtensa/src/esp32s2/Kconfig
@@ -650,17 +650,17 @@ config ESP32S2_OTA_SCRATCH_DEVPATH
endif
-comment "General MTD configuration"
+comment "General storage MTD configuration"
-config ESP32S2_MTD_OFFSET
- hex "MTD base address in SPI Flash"
+config ESP32S2_STORAGE_MTD_OFFSET
+ hex "Storage MTD base address in SPI Flash"
default 0x180000 if !ESP32S2_HAVE_OTA_PARTITION
default 0x250000 if ESP32S2_HAVE_OTA_PARTITION
---help---
MTD base address in SPI Flash.
-config ESP32S2_MTD_SIZE
- hex "MTD size in SPI Flash"
+config ESP32S2_STORAGE_MTD_SIZE
+ hex "Storage MTD size in SPI Flash"
default 0x100000
---help---
MTD size in SPI Flash.
[incubator-nuttx] 02/05: risc-v/esp32c3: Rename MTD-related configs
to become more intuitive
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 06bb85d8a55259517e995f40565287f866a91e21
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Mon Oct 25 14:43:13 2021 -0300
risc-v/esp32c3: Rename MTD-related configs to become more intuitive
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/risc-v/src/esp32c3/Kconfig | 10 +++++-----
.../risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig | 4 ++--
.../risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig | 4 ++--
boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/risc-v/src/esp32c3/Kconfig b/arch/risc-v/src/esp32c3/Kconfig
index e59e9aa..84a1431 100644
--- a/arch/risc-v/src/esp32c3/Kconfig
+++ b/arch/risc-v/src/esp32c3/Kconfig
@@ -872,17 +872,17 @@ config ESP32C3_OTA_SCRATCH_DEVPATH
endif
-comment "General MTD configuration"
+comment "General storage MTD configuration"
-config ESP32C3_MTD_OFFSET
- hex "MTD base address in SPI Flash"
+config ESP32C3_STORAGE_MTD_OFFSET
+ hex "Storage MTD base address in SPI Flash"
default 0x180000 if !ESP32C3_HAVE_OTA_PARTITION
default 0x250000 if ESP32C3_HAVE_OTA_PARTITION
---help---
MTD base address in SPI Flash.
-config ESP32C3_MTD_SIZE
- hex "MTD size in SPI Flash"
+config ESP32C3_STORAGE_MTD_SIZE
+ hex "Storage MTD size in SPI Flash"
default 0x100000
---help---
MTD size in SPI Flash.
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
index 23546b3..c21f975 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
@@ -20,9 +20,9 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
-CONFIG_ESP32C3_MTD_OFFSET=0x110000
-CONFIG_ESP32C3_MTD_SIZE=0xf0000
CONFIG_ESP32C3_SPIFLASH=y
+CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000
+CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000
CONFIG_FS_PROCFS=y
CONFIG_FS_SMARTFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
index 103aee3..bce0e0e 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
@@ -28,9 +28,9 @@ CONFIG_DEBUG_WIRELESS=y
CONFIG_DEBUG_WIRELESS_ERROR=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32C3_MTD_OFFSET=0x110000
-CONFIG_ESP32C3_MTD_SIZE=0xf0000
CONFIG_ESP32C3_SPIFLASH=y
+CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000
+CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000
CONFIG_ESP32C3_WIFI=y
CONFIG_ESP32C3_WIFI_SAVE_PARAM=y
CONFIG_ESP32C3_WIFI_STATION_SOFTAP_COEXISTENCE=y
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c
index bc00a5c..334c995 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_spiflash.c
@@ -432,8 +432,8 @@ static int init_storage_partition(void)
int ret = OK;
FAR struct mtd_dev_s *mtd;
- mtd = esp32c3_spiflash_alloc_mtdpart(CONFIG_ESP32C3_MTD_OFFSET,
- CONFIG_ESP32C3_MTD_SIZE);
+ mtd = esp32c3_spiflash_alloc_mtdpart(CONFIG_ESP32C3_STORAGE_MTD_OFFSET,
+ CONFIG_ESP32C3_STORAGE_MTD_SIZE);
if (!mtd)
{
ferr("ERROR: Failed to alloc MTD partition of SPI Flash\n");
[incubator-nuttx] 01/05: xtensa/esp32: Rename MTD-related configs
to become more intuitive
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit fb00ab32421873bbfa8edb34ab383d08334600fa
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Sun Oct 24 06:43:51 2021 -0300
xtensa/esp32: Rename MTD-related configs to become more intuitive
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/esp32/Kconfig | 10 +++++-----
boards/xtensa/esp32/common/src/esp32_board_spiflash.c | 4 ++--
boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig | 2 +-
.../xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig | 2 +-
boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig | 2 +-
boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig | 2 +-
boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 766e105..fdca65a 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -884,17 +884,17 @@ config ESP32_OTA_SCRATCH_DEVPATH
endif
-comment "General MTD configuration"
+comment "General storage MTD configuration"
-config ESP32_MTD_OFFSET
- hex "MTD base address in SPI Flash"
+config ESP32_STORAGE_MTD_OFFSET
+ hex "Storage MTD base address in SPI Flash"
default 0x180000 if !ESP32_HAVE_OTA_PARTITION
default 0x250000 if ESP32_HAVE_OTA_PARTITION
---help---
MTD base address in SPI Flash.
-config ESP32_MTD_SIZE
- hex "MTD size in SPI Flash"
+config ESP32_STORAGE_MTD_SIZE
+ hex "Storage MTD size in SPI Flash"
default 0x100000
---help---
MTD size in SPI Flash.
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
index 43cb8ea..c575fdd 100644
--- a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
+++ b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
@@ -413,8 +413,8 @@ static int init_storage_partition(void)
int ret = OK;
FAR struct mtd_dev_s *mtd;
- mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_MTD_OFFSET,
- CONFIG_ESP32_MTD_SIZE);
+ mtd = esp32_spiflash_alloc_mtdpart(CONFIG_ESP32_STORAGE_MTD_OFFSET,
+ CONFIG_ESP32_STORAGE_MTD_SIZE);
if (!mtd)
{
ferr("ERROR: Failed to alloc MTD partition of SPI Flash\n");
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
index 3e099e4..4985163 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
@@ -23,9 +23,9 @@ CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_AUTO_SLEEP=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
index 1d60b78..9696875 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
@@ -32,9 +32,9 @@ CONFIG_DRIVERS_BLUETOOTH=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_BLE=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_FS_PROCFS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
index 33b52eb..8ee14a5 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
@@ -22,9 +22,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLES_MQTTC=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
index c09974b..943efd8 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
@@ -29,9 +29,9 @@ CONFIG_DEBUG_WIRELESS=y
CONFIG_DEBUG_WIRELESS_ERROR=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index 19a53dc..7ddee6e 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -39,9 +39,9 @@ CONFIG_DEFAULT_TASK_STACKSIZE=4096
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
index aa18ee6..f3a27bd 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
@@ -29,9 +29,9 @@ CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
index 5e545d8..6028acd 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
@@ -23,9 +23,9 @@ CONFIG_BUILTIN=y
CONFIG_DEV_URANDOM=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
index ca12848..3c43080 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
@@ -22,9 +22,9 @@ CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_AUTO_SLEEP=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
index d045060..78f3edd 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
@@ -21,9 +21,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
index 3682917..82d066e 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
@@ -23,9 +23,9 @@ CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_AUTO_SLEEP=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
index a6964e2..13eb942 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
@@ -22,9 +22,9 @@ CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
-CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_SPIFLASH_SPIFFS=y
+CONFIG_ESP32_STORAGE_MTD_SIZE=0x80000
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
[incubator-nuttx] 05/05: boards/esp32c3-devkit: Port SPI Flash FS
fixes from ESP32
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c9d784a2383e4533247281849b650626dc1dccc3
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Mon Oct 25 14:51:17 2021 -0300
boards/esp32c3-devkit: Port SPI Flash FS fixes from ESP32
This commit brings 3 fixes/improvements applied to the Kconfig options
for SPI Flash file system support on board bring-up:
- (925e8f9) Optionally mount SPI Flash MTD on bring-up
- (f74c6f7) Transform SPI Flash FS deps into reverse deps
- (9056cab) Select MTD_SMART if SmartFS is selected for SPI Flash MTD
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
boards/risc-v/esp32c3/esp32c3-devkit/Kconfig | 46 ++++++++++++----------
.../esp32c3-devkit/configs/spiflash/defconfig | 3 +-
.../esp32c3-devkit/configs/sta_softap/defconfig | 2 +-
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/Kconfig b/boards/risc-v/esp32c3/esp32c3-devkit/Kconfig
index 218697c..6e1bb87 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/Kconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/Kconfig
@@ -50,26 +50,32 @@ config ESP32C3_MERGE_BINS
This is only useful when the path to binary files (e.g. bootloader)
is provided via the ESPTOOL_BINDIR variable.
-choice
- prompt "SPIFLASH File System"
- default ESP32C3_SPIFLASH_SMARTFS
- depends on ESP32C3_SPIFLASH
-
- config ESP32C3_SPIFLASH_SMARTFS
- bool "SmartFS"
- depends on FS_SMARTFS
-
- config ESP32C3_SPIFLASH_NXFFS
- bool "NXFFS"
- depends on FS_NXFFS
-
- config ESP32C3_SPIFLASH_SPIFFS
- bool "SPIFFS"
- depends on FS_SPIFFS
-
- config ESP32C3_SPIFLASH_LITTLEFS
- bool "LittleFS"
- depends on FS_LITTLEFS
+choice ESP32C3_SPIFLASH_FS
+ prompt "Mount SPI Flash MTD on bring-up"
+ default ESP32C3_SPIFLASH_SMARTFS
+ depends on ESP32C3_SPIFLASH
+ optional
+ ---help---
+ Mount the SPI Flash MTD with the selected File System format on board
+ bring-up.
+ If not selected, the MTD will be registered as a device node on /dev.
+
+ config ESP32C3_SPIFLASH_SMARTFS
+ bool "SmartFS"
+ select FS_SMARTFS
+ select MTD_SMART
+
+ config ESP32C3_SPIFLASH_NXFFS
+ bool "NXFFS"
+ select FS_NXFFS
+
+ config ESP32C3_SPIFLASH_SPIFFS
+ bool "SPIFFS"
+ select FS_SPIFFS
+
+ config ESP32C3_SPIFLASH_LITTLEFS
+ bool "LittleFS"
+ select FS_LITTLEFS
endchoice
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
index c21f975..dfab850 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/spiflash/defconfig
@@ -21,15 +21,14 @@ CONFIG_BOARD_LOOPSPERMSEC=15000
CONFIG_BUILTIN=y
CONFIG_DEV_ZERO=y
CONFIG_ESP32C3_SPIFLASH=y
+CONFIG_ESP32C3_SPIFLASH_SMARTFS=y
CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000
CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000
CONFIG_FS_PROCFS=y
-CONFIG_FS_SMARTFS=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
-CONFIG_MTD_SMART=y
CONFIG_NAME_MAX=48
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
index bce0e0e..e5500f7 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/sta_softap/defconfig
@@ -29,6 +29,7 @@ CONFIG_DEBUG_WIRELESS_ERROR=y
CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32C3_SPIFLASH=y
+CONFIG_ESP32C3_SPIFLASH_SPIFFS=y
CONFIG_ESP32C3_STORAGE_MTD_OFFSET=0x110000
CONFIG_ESP32C3_STORAGE_MTD_SIZE=0xf0000
CONFIG_ESP32C3_WIFI=y
@@ -37,7 +38,6 @@ CONFIG_ESP32C3_WIFI_STATION_SOFTAP_COEXISTENCE=y
CONFIG_EXAMPLES_DHCPD=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
[incubator-nuttx] 03/05: risc-v/esp32c3: Removed unused definitions
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 18f785c7b7d33b7d57e9921595a3757ad06e7c3b
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Mon Oct 25 14:43:37 2021 -0300
risc-v/esp32c3: Removed unused definitions
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
index 3ca88c2..34b8e26 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/src/esp32c3_bringup.c
@@ -84,9 +84,6 @@
* Pre-processor Definitions
****************************************************************************/
-#define ESP32C3_MTD_OFFSET CONFIG_ESP32C3_MTD_OFFSET
-#define ESP32C3_MTD_SIZE CONFIG_ESP32C3_MTD_SIZE
-
/****************************************************************************
* Public Functions
****************************************************************************/