You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2022/06/25 00:32:46 UTC
[incubator-nuttx] branch master updated (f2d1f25202 -> 429c474aff)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from f2d1f25202 drivers/lcd: Fix regression on ILI9341 introduced after #6465
new 87a2f35c2c esp32: Remove hard-coded SPI port for MMC/SD SPI
new d8e95284cb esp32: Add mmcsdspi config
new 429c474aff esp32-devkit: As suggest by Gustavo, remove mmcsdspi
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/esp32-devkitc/src/esp32_mmcsd.c | 2 +-
.../configs/mmcsdspi/defconfig | 15 +++++++++++++--
boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
rename boards/xtensa/esp32/{esp32-devkitc => esp32-wrover-kit}/configs/mmcsdspi/defconfig (81%)
[incubator-nuttx] 01/03: esp32: Remove hard-coded SPI port for MMC/SD SPI
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 87a2f35c2c1a8d36d000e25f49335f0e0edd98af
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Thu Jun 23 22:12:36 2022 -0300
esp32: Remove hard-coded SPI port for MMC/SD SPI
---
boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c | 2 +-
boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c
index 0f42d14e44..0bbe718ab5 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_mmcsd.c
@@ -64,7 +64,7 @@ int esp32_mmcsd_initialize(int minor)
mcinfo("INFO: Initializing mmcsd card\n");
- spi = esp32_spibus_initialize(2);
+ spi = esp32_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (spi == NULL)
{
mcerr("ERROR: Failed to initialize SPI port %d\n", 2);
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c
index 0857ce2eb3..893f0d96e3 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_mmcsd.c
@@ -64,7 +64,7 @@ int esp32_mmcsd_initialize(int minor)
mcinfo("INFO: Initializing mmcsd card\n");
- spi = esp32_spibus_initialize(2);
+ spi = esp32_spibus_initialize(CONFIG_NSH_MMCSDSPIPORTNO);
if (spi == NULL)
{
mcerr("ERROR: Failed to initialize SPI port %d\n", 2);
[incubator-nuttx] 02/03: esp32: Add mmcsdspi config
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d8e95284cb56e6042f7e1c0f8610af68bef4fe5e
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Thu Jun 23 22:06:43 2022 -0300
esp32: Add mmcsdspi config
---
.../esp32-wrover-kit/configs/mmcsdspi/defconfig | 68 ++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig
new file mode 100644
index 0000000000..96254d2ed5
--- /dev/null
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mmcsdspi/defconfig
@@ -0,0 +1,68 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# 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_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+# CONFIG_NSH_CMDPARMS is not set
+# CONFIG_SPI_EXCHANGE is not set
+CONFIG_ARCH="xtensa"
+CONFIG_ARCH_BOARD="esp32-wrover-kit"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y
+CONFIG_ARCH_CHIP="esp32"
+CONFIG_ARCH_CHIP_ESP32=y
+CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_XTENSA=y
+CONFIG_BOARD_LOOPSPERMSEC=16717
+CONFIG_BUILTIN=y
+CONFIG_DEBUG_ERROR=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_MEMCARD=y
+CONFIG_DEBUG_MEMCARD_ERROR=y
+CONFIG_DEBUG_MEMCARD_INFO=y
+CONFIG_DEBUG_MEMCARD_WARN=y
+CONFIG_DEBUG_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_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_IDLETHREAD_STACKSIZE=3072
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INTELHEX_BINARY=y
+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_LINELEN=64
+CONFIG_NSH_MMCSDSPIPORTNO=2
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=6
+CONFIG_START_MONTH=12
+CONFIG_START_YEAR=2011
+CONFIG_SYSTEM_NSH=y
+CONFIG_UART0_SERIAL_CONSOLE=y
[incubator-nuttx] 03/03: esp32-devkit: As suggest by Gustavo, remove mmcsdspi
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 429c474afff6f943afbab3ae125a62002691e28d
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Fri Jun 24 17:41:22 2022 -0300
esp32-devkit: As suggest by Gustavo, remove mmcsdspi
ESP32-Devkit doesn't have MMC/SD slot to put a card and it is basically
the same defconfig submitted to esp32-wrover-kit board that has that slot.
---
.../esp32/esp32-devkitc/configs/mmcsdspi/defconfig | 57 ----------------------
1 file changed, 57 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
deleted file mode 100644
index afea6b92bf..0000000000
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# This file is autogenerated: PLEASE DO NOT EDIT IT.
-#
-# You can use "make menuconfig" to make any modifications to the installed .config file.
-# You can then do "make savedefconfig" to generate a new defconfig file that includes your
-# 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_NSH_ARGCAT is not set
-# CONFIG_NSH_CMDOPT_HEXDUMP is not set
-# CONFIG_NSH_CMDPARMS is not set
-# CONFIG_SPI_EXCHANGE is not set
-CONFIG_ARCH="xtensa"
-CONFIG_ARCH_BOARD="esp32-devkitc"
-CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_ESP32_DEVKITC=y
-CONFIG_ARCH_CHIP="esp32"
-CONFIG_ARCH_CHIP_ESP32=y
-CONFIG_ARCH_CHIP_ESP32WROVER=y
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_XTENSA=y
-CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BUILTIN=y
-CONFIG_ESP32_SPI2=y
-CONFIG_ESP32_UART0=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FS_FAT=y
-CONFIG_FS_PROCFS=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_IDLETHREAD_STACKSIZE=3072
-CONFIG_INIT_ENTRYPOINT="nsh_main"
-CONFIG_INTELHEX_BINARY=y
-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_LINELEN=64
-CONFIG_NSH_MMCSDSPIPORTNO=2
-CONFIG_NSH_READLINE=y
-CONFIG_PREALLOC_TIMERS=4
-CONFIG_RAM_SIZE=114688
-CONFIG_RAM_START=0x20000000
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_WAITPID=y
-CONFIG_START_DAY=6
-CONFIG_START_MONTH=12
-CONFIG_START_YEAR=2011
-CONFIG_SYSTEM_NSH=y
-CONFIG_UART0_SERIAL_CONSOLE=y