You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2021/04/28 02:45:37 UTC
[incubator-nuttx] branch master updated (016652f -> 91955be)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 016652f risc-v/esp32c3: Change ESP32C3_RT_TIMER_TASK_PRIORITY comment into help text
new 4d3fa83 xtensa/esp32: Remove redundant dependency
new 03c8e2d xtensa/esp32: Remove inconsistent usage of comment command
new 95a76ad xtensa/esp32: Uniformize Kconfig alignment and styling
new 2b179c5 xtensa/esp32: Add missing default value for CONFIG_ESP32_GPIO_IRQ
new 91955be xtensa/esp32: Change ESP32_RT_TIMER_TASK_PRIORITY comment into help text
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/xtensa/src/esp32/Kconfig | 170 ++++++++++++++++++++++--------------------
1 file changed, 90 insertions(+), 80 deletions(-)
[incubator-nuttx] 01/05: xtensa/esp32: Remove redundant dependency
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4d3fa83d7acf1b35c0798ed5526b8fde75a14073
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Apr 27 18:15:12 2021 -0300
xtensa/esp32: Remove redundant dependency
---
arch/xtensa/src/esp32/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index cb76b0d..69faac0 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -10,7 +10,6 @@ comment "ESP32 Configuration Options"
choice
prompt "ESP32 Chip Selection"
default ARCH_CHIP_ESP32WROVER
- depends on ARCH_CHIP_ESP32
config ARCH_CHIP_ESP32S0WD
bool "ESP32-S0WD"
[incubator-nuttx] 03/05: xtensa/esp32: Uniformize Kconfig alignment
and styling
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 95a76adc90ec2629e22c49534ab291ee1c5b4bb3
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Apr 27 18:17:54 2021 -0300
xtensa/esp32: Uniformize Kconfig alignment and styling
---
arch/xtensa/src/esp32/Kconfig | 160 ++++++++++++++++++++++--------------------
1 file changed, 85 insertions(+), 75 deletions(-)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 5097acf..6723577 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -110,7 +110,7 @@ config ESP32_FLASH_16M
config ESP32_FLASH_DETECT
bool "Auto-detect FLASH size"
default y
- help
+ ---help---
Auto detect flash size when flashing.
config ESP32_PSRAM_8M
@@ -138,57 +138,60 @@ config ESP32_ESP32DXWDXX
choice ESP32_FLASH_MODE
prompt "SPI FLASH mode"
default ESP32_FLASH_MODE_DIO
- help
+ ---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_DIO
+ bool "Dual IO (DIO)"
- config ESP32_FLASH_MODE_DOUT
- bool "Dual Output (DOUT)"
+config ESP32_FLASH_MODE_DOUT
+ bool "Dual Output (DOUT)"
- config ESP32_FLASH_MODE_QIO
- bool "Quad IO (QIO)"
+config ESP32_FLASH_MODE_QIO
+ bool "Quad IO (QIO)"
- config ESP32_FLASH_MODE_QOUT
- bool "Quad Output (QOUT)"
+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
+ ---help---
SPI FLASH frequency
-
- config ESP32_FLASH_FREQ_80M
- bool "80 MHz"
- config ESP32_FLASH_FREQ_40M
- bool "40 MHz"
+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_26M
+ bool "26 MHz"
- config ESP32_FLASH_FREQ_20M
- bool "20 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
- help
+ ---help---
CPU frequency to be set on application startup.
- config ESP32_DEFAULT_CPU_FREQ_80
- bool "80 MHz"
- config ESP32_DEFAULT_CPU_FREQ_160
- bool "160 MHz"
- config ESP32_DEFAULT_CPU_FREQ_240
- bool "240 MHz"
-endchoice # CPU frequency
+config ESP32_DEFAULT_CPU_FREQ_80
+ bool "80 MHz"
+
+config ESP32_DEFAULT_CPU_FREQ_160
+ bool "160 MHz"
+
+config ESP32_DEFAULT_CPU_FREQ_240
+ bool "240 MHz"
+
+endchoice # ESP32_DEFAULT_CPU_FREQ
config ESP32_DEFAULT_CPU_FREQ_MHZ
int
@@ -357,14 +360,16 @@ if ESP32_SPIRAM && SMP
choice
prompt "How does SPIRAM share cache?"
default ESP32_MEMMAP_SPIRAM_CACHE_EVENODD
- help
+ ---help---
Selects the cache mode to CPU access the external memory.
- config ESP32_MEMMAP_SPIRAM_CACHE_EVENODD
- bool "Pro CPU uses even 32 byte ranges, App uses odd ones"
- config ESP32_MEMMAP_SPIRAM_CACHE_LOWHIGH
- bool "Pro CPU uses low 2MB ranges, App uses high ones"
-endchoice # CPU frequency
+config ESP32_MEMMAP_SPIRAM_CACHE_EVENODD
+ bool "Pro CPU uses even 32 byte ranges, App uses odd ones"
+
+config ESP32_MEMMAP_SPIRAM_CACHE_LOWHIGH
+ bool "Pro CPU uses low 2MB ranges, App uses high ones"
+
+endchoice # How does SPIRAM share cache?
endif
@@ -542,6 +547,7 @@ config ESP32_UART1_RXPIN
range 0 39
if SERIAL_IFLOWCONTROL || SERIAL_OFLOWCONTROL
+
config ESP32_UART1_RTSPIN
int "UART1 RTS Pin"
default 11
@@ -553,6 +559,7 @@ config ESP32_UART1_CTSPIN
range 0 39
endif # SERIAL_IFLOWCONTROL || SERIAL_OFLOWCONTROL
+
endif # ESP32_UART1
if ESP32_UART2
@@ -568,6 +575,7 @@ config ESP32_UART2_RXPIN
range 0 39
if SERIAL_IFLOWCONTROL || SERIAL_OFLOWCONTROL
+
config ESP32_UART2_RTSPIN
int "UART2 RTS Pin"
default 7
@@ -579,6 +587,7 @@ config ESP32_UART2_CTSPIN
range 0 39
endif # SERIAL_IFLOWCONTROL || SERIAL_OFLOWCONTROL
+
endif # ESP32_UART2
endmenu # UART configuration
@@ -715,20 +724,20 @@ menu "SPI Flash configuration"
config ESP32_MTD_OFFSET
hex "MTD base address in SPI Flash"
default 0x180000
- help
+ ---help---
MTD base address in SPI Flash.
config ESP32_MTD_SIZE
hex "MTD size in SPI Flash"
default 0x100000
- help
+ ---help---
MTD size in SPI Flash.
config ESP32_SPIFLASH_DEBUG
bool "Debug SPI Flash"
default n
depends on DEBUG_FS_INFO
- help
+ ---help---
Enable this option, read and write of SPI Flash
will show input arguments and result.
@@ -749,7 +758,8 @@ config ESP32_SPIRAM_TYPE_ESPPSRAM32
config ESP32_SPIRAM_TYPE_ESPPSRAM64
bool "ESP-PSRAM64 or LY68L6400"
-endchoice #ESP32_SPIRAM_TYPE
+
+endchoice # ESP32_SPIRAM_TYPE
config ESP32_SPIRAM_SIZE
int
@@ -761,8 +771,8 @@ config ESP32_SPIRAM_SIZE
choice ESP32_SPIRAM_SPEED
prompt "Set RAM clock speed"
default ESP32_SPIRAM_SPEED_40M
- help
- Select the speed for the SPI RAM chip.
+ ---help---
+ Select the speed for the SPI RAM chip.
config ESP32_SPIRAM_SPEED_40M
bool "40MHz clock speed"
@@ -776,39 +786,39 @@ config ESP32_SPIRAM_BOOT_INIT
bool "Initialize SPI RAM during startup"
depends on ESP32_SPIRAM
default "y"
- help
- If this is enabled, the SPI RAM will be enabled during initial
- boot. Unless you have specific requirements, you'll want to leave
- this enabled so memory allocated during boot-up can also be
- placed in SPI RAM.
+ ---help---
+ If this is enabled, the SPI RAM will be enabled during initial
+ boot. Unless you have specific requirements, you'll want to leave
+ this enabled so memory allocated during boot-up can also be
+ placed in SPI RAM.
config ESP32_SPIRAM_IGNORE_NOTFOUND
bool "Ignore PSRAM when not found"
default "n"
depends on ESP32_SPIRAM_BOOT_INIT && !BOOT_SDRAM_DATA
- help
- Normally, if psram initialization is enabled during compile time
- but not found at runtime, it is seen as an error making the CPU
- panic. If this is enabled, booting will complete but no PSRAM
- will be available.
+ ---help---
+ Normally, if psram initialization is enabled during compile time
+ but not found at runtime, it is seen as an error making the CPU
+ panic. If this is enabled, booting will complete but no PSRAM
+ will be available.
config ESP32_SPIRAM_2T_MODE
bool "Enable SPI PSRAM 2T mode"
depends on ESP32_SPIRAM
default "n"
- help
- Enable this option to fix single bit errors inside 64Mbit PSRAM.
- Some 64Mbit PSRAM chips have a hardware issue in the RAM which
- causes bit errors at multiple fixed bit positions.
- Note: If this option is enabled, the 64Mbit PSRAM chip will appear
- to be 32Mbit in size.
- Applications will not be affected unless the use the esp_himem
- APIs, which are not supported in 2T mode.
+ ---help---
+ Enable this option to fix single bit errors inside 64Mbit PSRAM.
+ Some 64Mbit PSRAM chips have a hardware issue in the RAM which
+ causes bit errors at multiple fixed bit positions.
+ Note: If this option is enabled, the 64Mbit PSRAM chip will appear
+ to be 32Mbit in size.
+ Applications will not be affected unless the use the esp_himem
+ APIs, which are not supported in 2T mode.
config ESP32_SPIRAM_BANKSWITCH_ENABLE
bool "Enable bank switching for >4MiB external RAM"
default n
- help
+ ---help---
The ESP32 only supports 4MiB of external RAM in its address
space. The hardware does support larger memories, but these
have to be bank-switched in and out of this address space.
@@ -827,7 +837,7 @@ config SPIRAM_BANKSWITCH_RESERVE
depends on ESP32_SPIRAM_BANKSWITCH_ENABLE
default 8
range 1 62
- help
+ ---help---
Select the amount of banks reserved for bank switching. Note
that the amount of RAM allocatable with malloc will decrease
by 32K for each page reserved here.
@@ -891,15 +901,15 @@ config ESP32_WIFI_STATION_SOFTAP_COEXISTENCE
endchoice # ESP32 WiFi mode
config ESP32_WIFI_STATIC_RXBUF_NUM
- int "WiFi static RX buffer number"
+ int "WiFi static RX buffer number"
default 10
config ESP32_WIFI_DYNAMIC_RXBUF_NUM
- int "WiFi dynamic RX buffer number"
+ int "WiFi dynamic RX buffer number"
default 32
config ESP32_WIFI_DYNAMIC_TXBUF_NUM
- int "WiFi dynamic TX buffer number"
+ int "WiFi dynamic TX buffer number"
default 32
config ESP32_WIFI_TX_AMPDU
@@ -911,7 +921,7 @@ config ESP32_WIFI_RX_AMPDU
default y
config ESP32_WIFI_RXBA_AMPDU_WZ
- int "WiFi RX BA AMPDU windown size"
+ int "WiFi RX BA AMPDU windown size"
default 6
config ESP32_WLAN_PKTBUF_NUM
@@ -921,36 +931,36 @@ config ESP32_WLAN_PKTBUF_NUM
config ESP32_WIFI_CONNECT_TIMEOUT
int "Connect timeout by second"
default 10
- help
+ ---help---
Max waiting time of connecting to AP.
config ESP32_WIFI_SCAN_RESULT_SIZE
int "Scan result buffer"
default 4096
- help
+ ---help---
Maximum scan result buffer size.
config ESP32_WIFI_SAVE_PARAM
bool "Save WiFi Parameters"
default n
- help
+ ---help---
If you enable this option, WiFi adapter parameters will be saved
into the file system instead of computing them each time.
These parameters mainly contains:
- - SSID
- - Password
- - BSSID
- - PMK(compute when connecting)
- - Author mode
- - MAC address
- - WiFi hardware configuration parameters
+ - SSID
+ - Password
+ - BSSID
+ - PMK(compute when connecting)
+ - Author mode
+ - MAC address
+ - WiFi hardware configuration parameters
config ESP32_WIFI_FS_MOUNTPT
string "Save WiFi Parameters"
default "/mnt/esp/wifi"
depends on ESP32_WIFI_SAVE_PARAM
- help
+ ---help---
Mount point of WiFi storage file system.
config ESP32_WIFI_STA_DISCONNECT_PM
[incubator-nuttx] 04/05: xtensa/esp32: Add missing default value
for CONFIG_ESP32_GPIO_IRQ
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2b179c5ab35d26dcaf4ef8dff7fe745a169f1da2
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Apr 27 18:18:15 2021 -0300
xtensa/esp32: Add missing default value for CONFIG_ESP32_GPIO_IRQ
---
arch/xtensa/src/esp32/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 6723577..fef0c6b 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -502,6 +502,7 @@ endmenu # Memory Configuration
config ESP32_GPIO_IRQ
bool "GPIO pin interrupts"
+ default n
---help---
Enable support for interrupting GPIO pins
[incubator-nuttx] 02/05: xtensa/esp32: Remove inconsistent usage of
comment command
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 03c8e2d5c759ebc4ad7d4bf262a3523428fec2a3
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Apr 27 18:16:30 2021 -0300
xtensa/esp32: Remove inconsistent usage of comment command
---
arch/xtensa/src/esp32/Kconfig | 3 ---
1 file changed, 3 deletions(-)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 69faac0..5097acf 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -83,9 +83,6 @@ config ARCH_CHIP_ESP32SOLO1
endchoice # ESP32 Chip Selection
-comment "Selected ESP32 chip without embedded Flash, an external Flash memory is required."
- depends on ARCH_CHIP_ESP32S0WD || ARCH_CHIP_ESP32D0WD
-
config ESP32_SINGLE_CPU
bool
default n
[incubator-nuttx] 05/05: xtensa/esp32: Change
ESP32_RT_TIMER_TASK_PRIORITY comment into help text
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 91955be0e1629d80c2bfa0573b7624c1383ef9c2
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Apr 27 18:35:24 2021 -0300
xtensa/esp32: Change ESP32_RT_TIMER_TASK_PRIORITY comment into help text
---
arch/xtensa/src/esp32/Kconfig | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index fef0c6b..a0a5f39 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -982,7 +982,10 @@ config ESP32_RT_TIMER_TASK_NAME
config ESP32_RT_TIMER_TASK_PRIORITY
int "Timer task priority"
- default 223 # Lower than high priority workqueue
+ default 223
+ ---help---
+ Priority level of the RT Timer task.
+ Must be lower than the SCHED_HPWORKPRIORITY.
config ESP32_RT_TIMER_TASK_STACK_SIZE
int "Timer task stack size"