Updated sdkconfig for esp-idf v2.0-rc1

2 files changed, 122 insertions, 16 deletions

diff --git a/build/esp32/sdk_build/sdkconfig b/build/esp32/sdk_build/sdkconfig
index f1bb237..500c6b3 100644
--- a/build/esp32/sdk_build/sdkconfig
+++ b/build/esp32/sdk_build/sdkconfig
@@ -38,10 +38,10 @@ CONFIG_ESPTOOLPY_BAUD_115200B=y
 CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_BAUD=115200
 # CONFIG_ESPTOOLPY_COMPRESSED is not set
-# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
-# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
-CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
-# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
+# CONFIG_FLASHMODE_QIO is not set
+# CONFIG_FLASHMODE_QOUT is not set
+CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
 # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
@@ -54,6 +54,22 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_MONITOR_BAUD_9600B is not set
+# CONFIG_MONITOR_BAUD_57600B is not set
+CONFIG_MONITOR_BAUD_115200B=y
+# CONFIG_MONITOR_BAUD_230400B is not set
+# CONFIG_MONITOR_BAUD_921600B is not set
+# CONFIG_MONITOR_BAUD_2MB is not set
+# CONFIG_MONITOR_BAUD_OTHER is not set
+CONFIG_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_MONITOR_BAUD=115200
 
 #
 # Partition Table
@@ -65,30 +81,50 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
 CONFIG_APP_OFFSET=0x10000
-CONFIG_PHY_DATA_OFFSET=0xf000
 CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
 # CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
 
 #
 # Component config
 #
+# CONFIG_AWS_IOT_SDK is not set
+CONFIG_BT_ENABLED=y
+CONFIG_BLUEDROID_ENABLED=y
 CONFIG_BTC_TASK_STACK_SIZE=3072
 # CONFIG_BLUEDROID_MEM_DEBUG is not set
-CONFIG_BT_RESERVE_DRAM=0
+# CONFIG_CLASSIC_BT_ENABLED is not set
+CONFIG_BT_DRAM_RELEASE=y
+CONFIG_GATTS_ENABLE=y
+CONFIG_GATTC_ENABLE=y
+CONFIG_SMP_ENABLE=y
+# CONFIG_BT_STACK_NO_LOG is not set
+CONFIG_BT_ACL_CONNECTIONS=4
+CONFIG_BTDM_CONTROLLER_RUN_CPU=0
+CONFIG_BT_RESERVE_DRAM=0x10000
 
 #
-# ESP32-specific config
+# ESP32-specific
 #
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-CONFIG_ESP32_ENABLE_STACK_WIFI=y
-# CONFIG_ESP32_ENABLE_STACK_BT is not set
 CONFIG_MEMMAP_SMP=y
 # CONFIG_MEMMAP_TRACEMEM is not set
+# CONFIG_MEMMAP_TRACEMEM_TWOBANKS is not set
+# CONFIG_ESP32_TRAX is not set
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
-CONFIG_WIFI_ENABLED=y
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP is not set
+# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
+# CONFIG_ESP32_APPTRACE_DEST_UART is not set
+CONFIG_ESP32_APPTRACE_DEST_NONE=y
+# CONFIG_ESP32_APPTRACE_ENABLE is not set
+# CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
+CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
+CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_MAIN_TASK_STACK_SIZE=4096
@@ -118,24 +154,74 @@ CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 # CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
 # CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
+# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set
+CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=0
-CONFIG_ESP32_PHY_AUTO_INIT=y
+# CONFIG_ESP32_XTAL_FREQ_40 is not set
+# CONFIG_ESP32_XTAL_FREQ_26 is not set
+CONFIG_ESP32_XTAL_FREQ_AUTO=y
+CONFIG_ESP32_XTAL_FREQ=0
+CONFIG_WIFI_ENABLED=y
+# CONFIG_SW_COEXIST_ENABLE is not set
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_AMPDU_ENABLED=y
+# CONFIG_ESP32_WIFI_NVS_ENABLED is not set
+CONFIG_PHY_ENABLED=y
+
+#
+# PHY
+#
+CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 # CONFIG_ETHERNET is not set
 
 #
+# FAT Filesystem support
+#
+CONFIG_FATFS_CODEPAGE_ASCII=y
+# CONFIG_FATFS_CODEPAGE_437 is not set
+# CONFIG_FATFS_CODEPAGE_720 is not set
+# CONFIG_FATFS_CODEPAGE_737 is not set
+# CONFIG_FATFS_CODEPAGE_771 is not set
+# CONFIG_FATFS_CODEPAGE_775 is not set
+# CONFIG_FATFS_CODEPAGE_850 is not set
+# CONFIG_FATFS_CODEPAGE_852 is not set
+# CONFIG_FATFS_CODEPAGE_855 is not set
+# CONFIG_FATFS_CODEPAGE_857 is not set
+# CONFIG_FATFS_CODEPAGE_860 is not set
+# CONFIG_FATFS_CODEPAGE_861 is not set
+# CONFIG_FATFS_CODEPAGE_862 is not set
+# CONFIG_FATFS_CODEPAGE_863 is not set
+# CONFIG_FATFS_CODEPAGE_864 is not set
+# CONFIG_FATFS_CODEPAGE_865 is not set
+# CONFIG_FATFS_CODEPAGE_866 is not set
+# CONFIG_FATFS_CODEPAGE_869 is not set
+# CONFIG_FATFS_CODEPAGE_932 is not set
+# CONFIG_FATFS_CODEPAGE_936 is not set
+# CONFIG_FATFS_CODEPAGE_949 is not set
+# CONFIG_FATFS_CODEPAGE_950 is not set
+CONFIG_FATFS_CODEPAGE=1
+CONFIG_FATFS_MAX_LFN=255
+
+#
 # FreeRTOS
 #
 CONFIG_FREERTOS_UNICORE=y
 CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
-# CONFIG_FREERTOS_CORETIMER_2 is not set
 CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY is not set
+# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3
 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
@@ -144,6 +230,11 @@ CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y
 # CONFIG_ENABLE_MEMORY_DEBUG is not set
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+# CONFIG_SUPPORT_STATIC_ALLOCATION is not set
+CONFIG_TIMER_TASK_PRIORITY=1
+CONFIG_TIMER_TASK_STACK_DEPTH=2048
+CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_FREERTOS_DEBUG_INTERNALS is not set
 
 #
@@ -165,9 +256,15 @@ CONFIG_LOG_COLORS=y
 CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0
 # CONFIG_LWIP_SO_REUSE is not set
+CONFIG_LWIP_SO_RCVBUF=y
 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 # CONFIG_LWIP_IP_FRAG is not set
 # CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_TCP_MAXRTX=12
+CONFIG_TCP_SYNMAXRTX=6
+CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+CONFIG_TCPIP_TASK_STACK_SIZE=2560
+# CONFIG_PPP_SUPPORT is not set
 
 #
 # mbedTLS
@@ -182,6 +279,14 @@ CONFIG_MBEDTLS_HAVE_TIME=y
 # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
 
 #
+# OpenSSL
+#
+# CONFIG_OPENSSL_DEBUG is not set
+CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
+# CONFIG_OPENSSL_ASSERT_EXIT is not set
+
+#
 # SPI Flash driver
 #
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
diff --git a/src/app/esp32/fileio.c b/src/app/esp32/fileio.c
index 4d72ba3..da03d58 100644
--- a/src/app/esp32/fileio.c
+++ b/src/app/esp32/fileio.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <limits.h>
 
 #include "forth.h"
 #include "compiler.h"
@@ -105,7 +106,7 @@ char *
 expand_name(char *name)
 {
   char envvar[64], *fnamep, *envp, paren, *fullp;
-  static char fullname[MAXPATHLEN];
+  static char fullname[PATH_MAX];
   int ndx;
 
   fullp = fullname;
@@ -120,7 +121,7 @@ expand_name(char *name)
       if (*fnamep == '{' || *fnamep == '(') {	// multi char env var
         paren = (*fnamep++ == '{') ? '}' : ')';
 
-        while (*fnamep != paren && ndx < MAXPATHLEN && *fnamep != '\0') {
+        while (*fnamep != paren && ndx < PATH_MAX && *fnamep != '\0') {
           envvar[ndx++] = *(fnamep++);
         }
         if (*fnamep == paren) {
@@ -160,8 +161,8 @@ static char *open_modes[]   = { "rb",  "ab", "r+b", "" };
 static char *popen_modes[]  = { "r",  "w", "rw", "" };
 cell pfopen(char *name, int len, int mode, cell *up)
 {
-    char cstrbuf[MAXPATHLEN];
-    char *s = expand_name(altocstr(name, len, cstrbuf, MAXPATHLEN));
+    char cstrbuf[PATH_MAX];
+    char *s = expand_name(altocstr(name, len, cstrbuf, PATH_MAX));
 
     FILE *res = fopen(s, open_modes[mode&3]);
     return (cell)res;