sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

esp32[-s2/-s3/-c3]: Re-sort SPI Flash configs

Browse Source 
- Reduce "SPI Flash configuration" menu dependency on SPI Flash driver
  just to MTD-related configs.
- Move SPI Flash Mode and Frequency configs to SPI Flash configuration
  menu.

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2022-10-26 17:51:05 -03:00 committed by Xiang Xiao
parent 677a907dc8
commit facdd4f2b9
4 changed files with 181 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
arch/risc-v/src/esp32c3/Kconfig
View File

@ -86,47 +86,6 @@ config ESP32C3_FLASH_DETECT
---help---
Auto detect flash size when flashing.
choice ESP32C3_FLASH_MODE
prompt "SPI FLASH mode"
default ESP32C3_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication with the attached SPI flash chip.
The option selected here is then used by esptool when flashing.
config ESP32C3_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32C3_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32C3_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32C3_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32C3_FLASH_MODE
choice ESP32C3_FLASH_FREQ
prompt "SPI FLASH frequency"
default ESP32C3_FLASH_FREQ_40M
---help---
SPI FLASH frequency
config ESP32C3_FLASH_FREQ_80M
bool "80 MHz"
config ESP32C3_FLASH_FREQ_40M
bool "40 MHz"
config ESP32C3_FLASH_FREQ_26M
bool "26 MHz"
config ESP32C3_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32C3_FLASH_FREQ
choice ESP32C3_CPU_FREQ
prompt "CPU frequency"
default ESP32C3_CPU_FREQ_160
@ -948,7 +907,47 @@ config ESP32C3_BLE_TASK_PRIORITY
endmenu # BLE Configuration
menu "SPI Flash configuration"
depends on ESP32C3_SPIFLASH
choice ESP32C3_FLASH_MODE
prompt "SPI Flash mode"
default ESP32C3_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication with the attached SPI Flash chip.
The option selected here is then used by esptool when flashing.
config ESP32C3_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32C3_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32C3_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32C3_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32C3_FLASH_MODE
choice ESP32C3_FLASH_FREQ
prompt "SPI Flash frequency"
default ESP32C3_FLASH_FREQ_40M
---help---
SPI Flash frequency.
config ESP32C3_FLASH_FREQ_80M
bool "80 MHz"
config ESP32C3_FLASH_FREQ_40M
bool "40 MHz"
config ESP32C3_FLASH_FREQ_26M
bool "26 MHz"
config ESP32C3_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32C3_FLASH_FREQ
if ESP32C3_HAVE_OTA_PARTITION
@ -993,6 +992,8 @@ config ESP32C3_OTA_SCRATCH_DEVPATH
endif
if ESP32C3_SPIFLASH
comment "General storage MTD configuration"
config ESP32C3_MTD
@ -1033,7 +1034,9 @@ config ESP32C3_PARTITION_MOUNTPT
default "/dev/esp/partition/"
depends on ESP32C3_PARTITION_TABLE
endif
endif # ESP32C3_APP_FORMAT_LEGACY
endif # ESP32C3_SPIFLASH
endmenu # SPI Flash configuration

91
arch/xtensa/src/esp32/Kconfig
View File

@ -135,47 +135,6 @@ config ESP32_ESP32DXWDXX
select ESP32_DUAL_CPU
select ARCH_HAVE_I2CRESET
choice ESP32_FLASH_MODE
prompt "SPI FLASH mode"
default ESP32_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication with the attached SPI flash chip.
The option selected here is then used by esptool when flashing.
config ESP32_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32_FLASH_MODE
choice ESP32_FLASH_FREQ
prompt "SPI FLASH frequency"
default ESP32_FLASH_FREQ_40M
---help---
SPI FLASH frequency
config ESP32_FLASH_FREQ_80M
bool "80 MHz"
config ESP32_FLASH_FREQ_40M
bool "40 MHz"
config ESP32_FLASH_FREQ_26M
bool "26 MHz"
config ESP32_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32_FLASH_FREQ
choice ESP32_DEFAULT_CPU_FREQ
prompt "CPU frequency"
default ESP32_DEFAULT_CPU_FREQ_240
@ -1637,7 +1596,47 @@ endif # ESP32_PCNT_U7
endmenu # ESP32_PCNT
menu "SPI Flash configuration"
depends on ESP32_SPIFLASH
choice ESP32_FLASH_MODE
prompt "SPI Flash mode"
default ESP32_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication with the attached SPI Flash chip.
The option selected here is then used by esptool when flashing.
config ESP32_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32_FLASH_MODE
choice ESP32_FLASH_FREQ
prompt "SPI Flash frequency"
default ESP32_FLASH_FREQ_40M
---help---
SPI Flash frequency.
config ESP32_FLASH_FREQ_80M
bool "80 MHz"
config ESP32_FLASH_FREQ_40M
bool "40 MHz"
config ESP32_FLASH_FREQ_26M
bool "26 MHz"
config ESP32_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32_FLASH_FREQ
if ESP32_HAVE_OTA_PARTITION
@ -1682,6 +1681,8 @@ config ESP32_OTA_SCRATCH_DEVPATH
endif
if ESP32_SPIFLASH
comment "General storage MTD configuration"
config ESP32_STORAGE_MTD_ENCRYPT
@ -1725,9 +1726,11 @@ config ESP32_PARTITION_MOUNTPT
default "/dev/esp/partition/"
depends on ESP32_PARTITION_TABLE
endif
endif # ESP32_PARTITION_TABLE
endmenu # ESP32_SPIFLASH
endif # ESP32_SPIFLASH
endmenu # SPI Flash configuration
menu "SPI RAM Config"
depends on ESP32_SPIRAM

85
arch/xtensa/src/esp32s2/Kconfig
View File

@ -178,48 +178,6 @@ config ESP32S2_FLASH_DETECT
---help---
Auto detect flash size when flashing.
choice ESP32S2_FLASH_MODE
prompt "SPI FLASH mode"
default ESP32S2_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication
with the attached SPI flash chip.
The option selected here is then used by esptool when flashing.
config ESP32S2_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32S2_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32S2_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32S2_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # SPI FLASH mode
choice ESP32S2_FLASH_FREQ
prompt "SPI FLASH frequency"
default ESP32S2_FLASH_FREQ_40M
---help---
SPI FLASH frequency
config ESP32S2_FLASH_FREQ_80M
bool "80 MHz"
config ESP32S2_FLASH_FREQ_40M
bool "40 MHz"
config ESP32S2_FLASH_FREQ_26M
bool "26 MHz"
config ESP32S2_FLASH_FREQ_20M
bool "20 MHz"
endchoice # SPI FLASH frequency
config ESP32S2_RUN_IRAM
bool "Run from IRAM"
default n
@ -689,7 +647,48 @@ config ESP32S2_I2CTIMEOMS
endmenu # I2C Configuration
menu "SPI Flash Configuration"
depends on ESP32S2_SPIFLASH
choice ESP32S2_FLASH_MODE
prompt "SPI Flash mode"
default ESP32S2_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication
with the attached SPI Flash chip.
The option selected here is then used by esptool when flashing.
config ESP32S2_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32S2_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32S2_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32S2_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32S2_FLASH_MODE
choice ESP32S2_FLASH_FREQ
prompt "SPI Flash frequency"
default ESP32S2_FLASH_FREQ_40M
---help---
SPI Flash frequency.
config ESP32S2_FLASH_FREQ_80M
bool "80 MHz"
config ESP32S2_FLASH_FREQ_40M
bool "40 MHz"
config ESP32S2_FLASH_FREQ_26M
bool "26 MHz"
config ESP32S2_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32S2_FLASH_FREQ
if ESP32S2_HAVE_OTA_PARTITION

89
arch/xtensa/src/esp32s3/Kconfig
View File

@ -250,48 +250,6 @@ config ESP32S3_PSRAM_8M
bool
default n
choice ESP32S3_FLASH_MODE
prompt "SPI FLASH mode"
default ESP32S3_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication
with the attached SPI flash chip.
The option selected here is then used by esptool when flashing.
config ESP32S3_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32S3_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32S3_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32S3_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32S3_FLASH_MODE
choice ESP32S3_FLASH_FREQ
prompt "SPI FLASH frequency"
default ESP32S3_FLASH_FREQ_40M
---help---
SPI FLASH frequency
config ESP32S3_FLASH_FREQ_120M
bool "120 MHz"
config ESP32S3_FLASH_FREQ_80M
bool "80 MHz"
config ESP32S3_FLASH_FREQ_40M
bool "40 MHz"
config ESP32S3_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32S3_FLASH_FREQ
config ESP32S3_RUN_IRAM
bool "Run from IRAM"
default n
@ -826,7 +784,50 @@ config ESP32S3_SPIFLASH
default n
menu "SPI Flash configuration"
depends on ESP32S3_SPIFLASH
choice ESP32S3_FLASH_MODE
prompt "SPI Flash mode"
default ESP32S3_FLASH_MODE_DIO
---help---
These options control how many I/O pins are used for communication
with the attached SPI Flash chip.
The option selected here is then used by esptool when flashing.
config ESP32S3_FLASH_MODE_DIO
bool "Dual IO (DIO)"
config ESP32S3_FLASH_MODE_DOUT
bool "Dual Output (DOUT)"
config ESP32S3_FLASH_MODE_QIO
bool "Quad IO (QIO)"
config ESP32S3_FLASH_MODE_QOUT
bool "Quad Output (QOUT)"
endchoice # ESP32S3_FLASH_MODE
choice ESP32S3_FLASH_FREQ
prompt "SPI Flash frequency"
default ESP32S3_FLASH_FREQ_40M
---help---
SPI Flash frequency
config ESP32S3_FLASH_FREQ_120M
bool "120 MHz"
config ESP32S3_FLASH_FREQ_80M
bool "80 MHz"
config ESP32S3_FLASH_FREQ_40M
bool "40 MHz"
config ESP32S3_FLASH_FREQ_20M
bool "20 MHz"
endchoice # ESP32S3_FLASH_FREQ
if ESP32S3_SPIFLASH
comment "General storage MTD configuration"
@ -853,6 +854,8 @@ config ESP32S3_STORAGE_MTD_DEBUG
If this option is enabled, Storage MTD driver read and write functions
will output input parameters and return values (if applicable).
endif # ESP32S3_SPIFLASH
endmenu # SPI Flash configuration
menu "Application Image Configuration"