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/23 09:01:53 UTC
[incubator-nuttx] branch master updated (e1a0a11 -> 9056cab)
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 e1a0a11 stm32h7:Support CONFIG_MPU_RESET and CONFIG_ARM_MPU_EARLY_RESET
new 925e8f9 boards/esp32: Optionally mount SPI Flash MTD on bring-up
new f74c6f7 boards/esp32: Transform SPI Flash FS deps into reverse deps
new 9056cab boards/esp32: Select MTD_SMART if SmartFS is selected for SPI Flash MTD
The 3 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:
boards/xtensa/esp32/common/Kconfig | 16 +++++++++++-----
.../xtensa/esp32/esp32-devkitc/configs/autopm/defconfig | 2 +-
.../xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig | 2 +-
.../xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/spiflash/defconfig | 3 +--
.../esp32/esp32-devkitc/configs/sta_softap/defconfig | 2 +-
boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig | 2 +-
.../esp32/esp32-devkitc/configs/wapi_smp/defconfig | 2 +-
.../xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/autopm/defconfig | 2 +-
.../esp32/esp32-ethernet-kit/configs/wapi/defconfig | 2 +-
.../esp32/esp32-wrover-kit/configs/autopm/defconfig | 2 +-
.../xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig | 2 +-
13 files changed, 23 insertions(+), 18 deletions(-)
[incubator-nuttx] 01/03: boards/esp32: Optionally mount SPI Flash
MTD on bring-up
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 925e8f9d54883897956e1c545d263bfbbef16b2d
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Oct 22 12:03:16 2021 -0300
boards/esp32: Optionally mount SPI Flash MTD on bring-up
Give the user the option to simply register the SPI Flash MTD as a
device node on /dev.
Currently, this is achievable only when SmartFS (which is the default FS
option) is disabled by force. This behavior is fixed by using the
"optional" Kconfig keyword, which makes the "choice" selectable.
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
boards/xtensa/esp32/common/Kconfig | 7 ++++++-
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/spiflash/defconfig | 3 +--
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 +-
boards/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(+), 14 deletions(-)
diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index 4a93fca..c7e26a3 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -19,9 +19,14 @@ config ESP32_QEMU_IMAGE
Create a binary flash image used for QEMU.
choice ESP32_SPIFLASH_FS
- prompt "SPIFLASH File System"
+ prompt "Mount SPI Flash MTD on bring-up"
default ESP32_SPIFLASH_SMARTFS
depends on ESP32_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 ESP32_SPIFLASH_SMARTFS
bool "SmartFS"
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
index 0dccdd4..3e099e4 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/autopm/defconfig
@@ -25,12 +25,12 @@ 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_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
index 1d6a244..1d60b78 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/blewifi/defconfig
@@ -34,10 +34,10 @@ CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_BLE=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
index f22d81b..33b52eb 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mqttc/defconfig
@@ -24,11 +24,11 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLES_MQTTC=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
index c62111c..e338a82 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
@@ -20,15 +20,14 @@ CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SMARTFS=y
CONFIG_ESP32_UART0=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SMARTFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=3
-CONFIG_MTD_SMART=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_DISABLE_LOSMART=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
index fdd2e6f..c09974b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
@@ -31,6 +31,7 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIFI_STATION_SOFTAP_COEXISTENCE=y
@@ -38,7 +39,6 @@ CONFIG_ESP32_WIRELESS=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
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index dff24e8..19a53dc 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -41,11 +41,11 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=3
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
index f690dab..aa18ee6 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
@@ -31,13 +31,13 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_WEBSERVER=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=2048
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
index d3391b6..5e545d8 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wifinsh/defconfig
@@ -25,11 +25,11 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
index 327d509..ca12848 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/autopm/defconfig
@@ -24,12 +24,12 @@ 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_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
index fad8d03..d045060 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
@@ -23,11 +23,11 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
index 6378909..3682917 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/autopm/defconfig
@@ -25,12 +25,12 @@ 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_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_EXAMPLE_POWER_SAVE_MIN_MODEM=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
index 833b25e..a6964e2 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
@@ -24,11 +24,11 @@ CONFIG_DRIVERS_IEEE80211=y
CONFIG_DRIVERS_WIRELESS=y
CONFIG_ESP32_MTD_SIZE=0x80000
CONFIG_ESP32_SPIFLASH=y
+CONFIG_ESP32_SPIFLASH_SPIFFS=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIFI_SAVE_PARAM=y
CONFIG_ESP32_WIRELESS=y
CONFIG_FS_PROCFS=y
-CONFIG_FS_SPIFFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
[incubator-nuttx] 02/03: boards/esp32: Transform SPI Flash FS deps
into reverse deps
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 f74c6f7f5b21ef5927dfd802422b2d3a8805a239
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Oct 22 12:05:13 2021 -0300
boards/esp32: Transform SPI Flash FS deps into reverse deps
Currently, when no file system is selected, the "choice" lists zero
entries, which is very confusing to the user. To handle this, the
"choice" options have their dependencies ("depends on") transformed into
reverse dependencies ("select").
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
boards/xtensa/esp32/common/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index c7e26a3..3051690 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -30,19 +30,19 @@ choice ESP32_SPIFLASH_FS
config ESP32_SPIFLASH_SMARTFS
bool "SmartFS"
- depends on FS_SMARTFS
+ select FS_SMARTFS
config ESP32_SPIFLASH_NXFFS
bool "NXFFS"
- depends on FS_NXFFS
+ select FS_NXFFS
config ESP32_SPIFLASH_SPIFFS
bool "SPIFFS"
- depends on FS_SPIFFS
+ select FS_SPIFFS
config ESP32_SPIFLASH_LITTLEFS
bool "LittleFS"
- depends on FS_LITTLEFS
+ select FS_LITTLEFS
endchoice
[incubator-nuttx] 03/03: boards/esp32: Select MTD_SMART if SmartFS
is selected for SPI Flash MTD
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 9056cabd8319c53ccba6328c830a2a2505d61f2d
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Oct 22 12:06:17 2021 -0300
boards/esp32: Select MTD_SMART if SmartFS is selected for SPI Flash MTD
If MTD_SMART is not selected for build, it will result in a build error.
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
boards/xtensa/esp32/common/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/boards/xtensa/esp32/common/Kconfig b/boards/xtensa/esp32/common/Kconfig
index 3051690..72b7913 100644
--- a/boards/xtensa/esp32/common/Kconfig
+++ b/boards/xtensa/esp32/common/Kconfig
@@ -31,6 +31,7 @@ choice ESP32_SPIFLASH_FS
config ESP32_SPIFLASH_SMARTFS
bool "SmartFS"
select FS_SMARTFS
+ select MTD_SMART
config ESP32_SPIFLASH_NXFFS
bool "NXFFS"