Gen 155 (#54)

* normalizing sdkconfig * normalizing sdkconfig
ModusCreateOrg · Oct 23, 2018 · d1a6a97 · d1a6a97
1 parent dcdc9c4
commit d1a6a97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 83 deletions.
diff --git a/sdkconfig.linux b/sdkconfig.linux
@@ -24,12 +24,10 @@ CONFIG_BOOTLOADER_SPI_WP_PIN=7
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
-CONFIG_BOOTLOADER_WDT_ENABLE=
 
 #
 # Security features
 #
-CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=
 CONFIG_SECURE_BOOT_ENABLED=
 CONFIG_FLASH_ENCRYPTION_ENABLED=
 
@@ -122,9 +120,6 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BT_RESERVE_DRAM=0
 
@@ -139,12 +134,10 @@ CONFIG_ADC_FORCE_XPD_FSM=
 CONFIG_ADC2_DISABLE_DAC=y
 
 #
-# SPI configuration
+# SPI master configuration
 #
 CONFIG_SPI_MASTER_IN_IRAM=
 CONFIG_SPI_MASTER_ISR_IN_IRAM=
-CONFIG_SPI_SLAVE_IN_IRAM=
-CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 
 #
 # ESP32-specific
@@ -165,8 +158,8 @@ CONFIG_SPIRAM_USE_CAPS_ALLOC=y
 CONFIG_SPIRAM_USE_MALLOC=
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=y
 CONFIG_SPIRAM_SIZE=4194304
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM_SPEED_80M=
+CONFIG_SPIRAM_SPEED_40M=
+CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_MEMTEST=
 CONFIG_SPIRAM_CACHE_WORKAROUND=
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
@@ -220,15 +213,12 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5=
 CONFIG_BROWNOUT_DET_LVL_SEL_6=
 CONFIG_BROWNOUT_DET_LVL_SEL_7=
 CONFIG_BROWNOUT_DET_LVL=0
-CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
 CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
 CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
-CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
-CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_XTAL_FREQ_40=y
@@ -290,9 +280,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
 CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
-CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
-CONFIG_EMAC_TASK_STACK_SIZE=3072
 
 #
 # FAT Filesystem support
@@ -370,12 +358,6 @@ CONFIG_HEAP_POISONING_LIGHT=
 CONFIG_HEAP_POISONING_COMPREHENSIVE=
 CONFIG_HEAP_TRACING=
 
-#
-# HTTP Server
-#
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
-CONFIG_HTTPD_MAX_URI_LEN=512
-
 #
 # libsodium
 #
@@ -407,11 +389,8 @@ CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
-CONFIG_ESP_GRATUITOUS_ARP=y
-CONFIG_GARP_TMR_INTERVAL=60
 CONFIG_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
-CONFIG_LWIP_DHCP_RESTORE_LAST_IP=
 
 #
 # DHCP server
@@ -462,7 +441,6 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_PLATFORM_MEMORY=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_DEBUG=
 CONFIG_MBEDTLS_HARDWARE_AES=y
@@ -543,17 +521,6 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 #
 CONFIG_MDNS_MAX_SERVICES=1
 
-#
-# ESP-MQTT Configurations
-#
-CONFIG_MQTT_PROTOCOL_311=y
-CONFIG_MQTT_TRANSPORT_SSL=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
-CONFIG_MQTT_USE_CUSTOM_CONFIG=
-CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=
-CONFIG_MQTT_CUSTOM_OUTBOX=
-
 #
 # OpenSSL
 #
@@ -609,16 +576,14 @@ CONFIG_SPIFFS_CHECK_DBG=
 CONFIG_SPIFFS_TEST_VISUALISATION=y
 
 #
-# TCP/IP Adapter
+# tcpip adapter
 #
 CONFIG_IP_LOST_TIMER_INTERVAL=120
-CONFIG_TCPIP_LWIP=y
 
 #
 # Virtual file system
 #
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_SUPPORT_TERMIOS=y
 
 #
 # Wear Levelling

diff --git a/sdkconfig.osx b/sdkconfig.osx
@@ -24,12 +24,10 @@ CONFIG_BOOTLOADER_SPI_WP_PIN=7
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
-#CONFIG_BOOTLOADER_WDT_ENABLE=
 
 #
 # Security features
 #
-CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=
 CONFIG_SECURE_BOOT_ENABLED=
 CONFIG_FLASH_ENCRYPTION_ENABLED=
 
@@ -122,9 +120,6 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
-CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BT_RESERVE_DRAM=0
 
@@ -139,12 +134,10 @@ CONFIG_ADC_FORCE_XPD_FSM=
 CONFIG_ADC2_DISABLE_DAC=y
 
 #
-# SPI configuration
+# SPI master configuration
 #
 CONFIG_SPI_MASTER_IN_IRAM=
 CONFIG_SPI_MASTER_ISR_IN_IRAM=
-CONFIG_SPI_SLAVE_IN_IRAM=
-CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 
 #
 # ESP32-specific
@@ -161,18 +154,15 @@ CONFIG_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=
 CONFIG_SPIRAM_USE_MEMMAP=
-CONFIG_SPIRAM_USE_CAPS_ALLOC=
-CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_USE_CAPS_ALLOC=y
+CONFIG_SPIRAM_USE_MALLOC=
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=y
 CONFIG_SPIRAM_SIZE=4194304
-CONFIG_SPIRAM_SPEED_40M=y
-CONFIG_SPIRAM_SPEED_80M=
+CONFIG_SPIRAM_SPEED_40M=
+CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_MEMTEST=
 CONFIG_SPIRAM_CACHE_WORKAROUND=
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
-CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
@@ -223,15 +213,12 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5=
 CONFIG_BROWNOUT_DET_LVL_SEL_6=
 CONFIG_BROWNOUT_DET_LVL_SEL_7=
 CONFIG_BROWNOUT_DET_LVL=0
-CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
 CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
 CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
-CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
-CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_XTAL_FREQ_40=y
@@ -250,6 +237,7 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CSI_ENABLED=
@@ -292,9 +280,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
 CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
-CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
-CONFIG_EMAC_TASK_STACK_SIZE=3072
 
 #
 # FAT Filesystem support
@@ -372,12 +358,6 @@ CONFIG_HEAP_POISONING_LIGHT=
 CONFIG_HEAP_POISONING_COMPREHENSIVE=
 CONFIG_HEAP_TRACING=
 
-#
-# HTTP Server
-#
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
-CONFIG_HTTPD_MAX_URI_LEN=512
-
 #
 # libsodium
 #
@@ -409,11 +389,8 @@ CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
-CONFIG_ESP_GRATUITOUS_ARP=y
-CONFIG_GARP_TMR_INTERVAL=60
 CONFIG_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
-CONFIG_LWIP_DHCP_RESTORE_LAST_IP=
 
 #
 # DHCP server
@@ -464,7 +441,6 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # mbedTLS
 #
-CONFIG_MBEDTLS_PLATFORM_MEMORY=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_DEBUG=
 CONFIG_MBEDTLS_HARDWARE_AES=y
@@ -545,17 +521,6 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 #
 CONFIG_MDNS_MAX_SERVICES=1
 
-#
-# ESP-MQTT Configurations
-#
-CONFIG_MQTT_PROTOCOL_311=y
-CONFIG_MQTT_TRANSPORT_SSL=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
-CONFIG_MQTT_USE_CUSTOM_CONFIG=
-CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=
-CONFIG_MQTT_CUSTOM_OUTBOX=
-
 #
 # OpenSSL
 #
@@ -611,16 +576,14 @@ CONFIG_SPIFFS_CHECK_DBG=
 CONFIG_SPIFFS_TEST_VISUALISATION=y
 
 #
-# TCP/IP Adapter
+# tcpip adapter
 #
 CONFIG_IP_LOST_TIMER_INTERVAL=120
-CONFIG_TCPIP_LWIP=y
 
 #
 # Virtual file system
 #
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_SUPPORT_TERMIOS=y
 
 #
 # Wear Levelling