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/nuttx.git
commit 02dae3e5eb0095091bdc19ceda51478488b5cb77
Author: Filipe Cavalcanti <filipe.cavalca...@espressif.com>
AuthorDate: Mon Jun 2 12:06:52 2025 -0300
boards/xtensa: add SDMMC SPI defconfig to ESP32|S2|S3 boards
Adds a defconfig for SDMMC over SPI to the following boards:
esp32-devkitc, esp32s2-saola-1 and esp32s3-devkit.
Renames the defconfig name for:
esp32-lyrat and esp32-wrover-kit.
Signed-off-by: Filipe Cavalcanti <filipe.cavalca...@espressif.com>
---
.../configs/sdmmc_spi}/defconfig | 21 +++++-----------
.../configs/{mmcsdspi => sdmmc_spi}/defconfig | 5 ----
.../configs/{mmcsdspi => sdmmc_spi}/defconfig | 5 ----
.../esp32s2-saola-1/configs/sdmmc_spi}/defconfig | 29 ++++++++--------------
.../esp32s3-devkit/configs/sdmmc_spi}/defconfig | 29 +++++++---------------
5 files changed, 25 insertions(+), 64 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
b/boards/xtensa/esp32/esp32-devkitc/configs/sdmmc_spi/defconfig
similarity index 76%
copy from boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
copy to boards/xtensa/esp32/esp32-devkitc/configs/sdmmc_spi/defconfig
index 70072b6cb2..1c0f2271f1 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/sdmmc_spi/defconfig
@@ -6,17 +6,17 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_SPI2_DMA is not set
+# CONFIG_ESP32_SPI3_DMA is not set
# CONFIG_MMCSD_HAVE_CARDDETECT is not set
# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
-# CONFIG_MMCSD_MMCSUPPORT is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+# CONFIG_SPI_CALLBACK is not set
# CONFIG_SPI_EXCHANGE is not set
CONFIG_ARCH="xtensa"
-CONFIG_ARCH_BOARD="esp32-lyrat"
+CONFIG_ARCH_BOARD="esp32-devkitc"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32_LYRAT=y
+CONFIG_ARCH_BOARD_ESP32_DEVKITC=y
CONFIG_ARCH_CHIP="esp32"
CONFIG_ARCH_CHIP_ESP32=y
CONFIG_ARCH_CHIP_ESP32WROVER=y
@@ -24,15 +24,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_MEMCARD_INFO=y
-CONFIG_DEBUG_MEMCARD_WARN=y
-CONFIG_ESP32_SPI2=y
-CONFIG_ESP32_SPI2_CSPIN=13
-CONFIG_ESP32_SPI2_MISOPIN=2
-CONFIG_ESP32_SPI2_MOSIPIN=15
+CONFIG_ESP32_SPI3=y
CONFIG_ESP32_UART0=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
@@ -46,12 +38,11 @@ CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LINE_MAX=64
CONFIG_MMCSD=y
-CONFIG_MMCSD_SPICLOCK=4000000
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_MMCSDSPIPORTNO=2
+CONFIG_NSH_MMCSDSPIPORTNO=3
CONFIG_NSH_READLINE=y
CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=114688
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
b/boards/xtensa/esp32/esp32-lyrat/configs/sdmmc_spi/defconfig
similarity index 92%
copy from boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
copy to boards/xtensa/esp32/esp32-lyrat/configs/sdmmc_spi/defconfig
index 70072b6cb2..510fc00587 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32/esp32-lyrat/configs/sdmmc_spi/defconfig
@@ -24,11 +24,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_MEMCARD_INFO=y
-CONFIG_DEBUG_MEMCARD_WARN=y
CONFIG_ESP32_SPI2=y
CONFIG_ESP32_SPI2_CSPIN=13
CONFIG_ESP32_SPI2_MISOPIN=2
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig
b/boards/xtensa/esp32/esp32-wrover-kit/configs/sdmmc_spi/defconfig
similarity index 92%
rename from boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig
rename to boards/xtensa/esp32/esp32-wrover-kit/configs/sdmmc_spi/defconfig
index cd0619d808..959d038086 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/sdmmc_spi/defconfig
@@ -24,11 +24,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_MEMCARD_INFO=y
-CONFIG_DEBUG_MEMCARD_WARN=y
CONFIG_ESP32_SPI2=y
CONFIG_ESP32_SPI2_CSPIN=13
CONFIG_ESP32_SPI2_MISOPIN=2
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sdmmc_spi/defconfig
similarity index 70%
copy from boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
copy to boards/xtensa/esp32s2/esp32s2-saola-1/configs/sdmmc_spi/defconfig
index 70072b6cb2..ff762234a7 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/sdmmc_spi/defconfig
@@ -6,34 +6,27 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_SPI2_DMA is not set
+# CONFIG_ESP32S2_SPI2_DMA is not set
# CONFIG_MMCSD_HAVE_CARDDETECT is not set
# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
-# CONFIG_MMCSD_MMCSUPPORT is not set
+# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_SPI_EXCHANGE is not set
CONFIG_ARCH="xtensa"
-CONFIG_ARCH_BOARD="esp32-lyrat"
+CONFIG_ARCH_BOARD="esp32s2-saola-1"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32_LYRAT=y
-CONFIG_ARCH_CHIP="esp32"
-CONFIG_ARCH_CHIP_ESP32=y
-CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_BOARD_ESP32S2_SAOLA_1=y
+CONFIG_ARCH_CHIP="esp32s2"
+CONFIG_ARCH_CHIP_ESP32S2=y
+CONFIG_ARCH_CHIP_ESP32S2WROVER=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_MEMCARD_INFO=y
-CONFIG_DEBUG_MEMCARD_WARN=y
-CONFIG_ESP32_SPI2=y
-CONFIG_ESP32_SPI2_CSPIN=13
-CONFIG_ESP32_SPI2_MISOPIN=2
-CONFIG_ESP32_SPI2_MOSIPIN=15
-CONFIG_ESP32_UART0=y
+CONFIG_ESP32S2_MERGE_BINS=y
+CONFIG_ESP32S2_SPI2=y
+CONFIG_ESP32S2_UART0=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
@@ -46,8 +39,6 @@ CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LINE_MAX=64
CONFIG_MMCSD=y
-CONFIG_MMCSD_SPICLOCK=4000000
-CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
b/boards/xtensa/esp32s3/esp32s3-devkit/configs/sdmmc_spi/defconfig
similarity index 68%
rename from boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
rename to boards/xtensa/esp32s3/esp32s3-devkit/configs/sdmmc_spi/defconfig
index 70072b6cb2..e0fad37021 100644
--- a/boards/xtensa/esp32/esp32-lyrat/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/sdmmc_spi/defconfig
@@ -6,34 +6,25 @@
# modifications.
#
# CONFIG_ARCH_LEDS is not set
-# CONFIG_ESP32_SPI2_DMA is not set
# CONFIG_MMCSD_HAVE_CARDDETECT is not set
# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
-# CONFIG_MMCSD_MMCSUPPORT is not set
+# CONFIG_NDEBUG is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
-# CONFIG_SPI_EXCHANGE is not set
CONFIG_ARCH="xtensa"
-CONFIG_ARCH_BOARD="esp32-lyrat"
+CONFIG_ARCH_BOARD="esp32s3-devkit"
CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32_LYRAT=y
-CONFIG_ARCH_CHIP="esp32"
-CONFIG_ARCH_CHIP_ESP32=y
-CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_BOARD_ESP32S3_DEVKIT=y
+CONFIG_ARCH_CHIP="esp32s3"
+CONFIG_ARCH_CHIP_ESP32S3=y
+CONFIG_ARCH_CHIP_ESP32S3WROOM1N4=y
+CONFIG_ARCH_INTERRUPTSTACK=2048
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DEBUG_FEATURES=y
-CONFIG_DEBUG_MEMCARD=y
-CONFIG_DEBUG_MEMCARD_ERROR=y
-CONFIG_DEBUG_MEMCARD_INFO=y
-CONFIG_DEBUG_MEMCARD_WARN=y
-CONFIG_ESP32_SPI2=y
-CONFIG_ESP32_SPI2_CSPIN=13
-CONFIG_ESP32_SPI2_MISOPIN=2
-CONFIG_ESP32_SPI2_MOSIPIN=15
-CONFIG_ESP32_UART0=y
+CONFIG_ESP32S3_SPI2=y
+CONFIG_ESP32S3_UART0=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
@@ -46,8 +37,6 @@ CONFIG_INIT_STACKSIZE=3072
CONFIG_INTELHEX_BINARY=y
CONFIG_LINE_MAX=64
CONFIG_MMCSD=y
-CONFIG_MMCSD_SPICLOCK=4000000
-CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
