Fix io16 io17 and PSRAM support (#1564)

* Add PSRAM init and malloc funtions * Rebuild IDF libs
2018-06-30 23:06:50 +02:00
parent b855eb23a7
commit 184bb069f2
48 changed files with 132 additions and 7 deletions
--- a/tools/sdk/bin/bootloader_dio_40m.bin
+++ b/tools/sdk/bin/bootloader_dio_40m.bin
--- a/tools/sdk/bin/bootloader_dout_40m.bin
+++ b/tools/sdk/bin/bootloader_dout_40m.bin
--- a/tools/sdk/bin/bootloader_qout_40m.bin
+++ b/tools/sdk/bin/bootloader_qout_40m.bin
--- a/tools/sdk/bin/bootloader_qout_80m.bin
+++ b/tools/sdk/bin/bootloader_qout_80m.bin
--- a/tools/sdk/include/config/sdkconfig.h
+++ b/tools/sdk/include/config/sdkconfig.h
@ -190,7 +190,6 @@
 #define CONFIG_LOG_BOOTLOADER_LEVEL 0
 #define CONFIG_MBEDTLS_TLS_ENABLED 1
 #define CONFIG_LWIP_MAX_RAW_PCBS 16
-#define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
 #define CONFIG_SMP_ENABLE 1
 #define CONFIG_SPIRAM_SIZE 4194304
 #define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
@ -228,6 +227,7 @@
 #define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
 #define CONFIG_MONITOR_BAUD 115200
 #define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
+#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
 #define CONFIG_FREERTOS_CORETIMER_0 1
 #define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
 #define CONFIG_MBEDTLS_HAVE_TIME 1
@ -238,12 +238,10 @@
 #define CONFIG_ADC_CAL_EFUSE_VREF_ENABLE 1
 #define CONFIG_MBEDTLS_TLS_SERVER 1
 #define CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT 1
-#define CONFIG_SPIRAM_BOOT_INIT 1
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_CLASSIC_BT_ENABLED 1
 #define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
-#define CONFIG_SPIRAM_MEMTEST 1
 #define CONFIG_WL_SECTOR_SIZE_4096 1
 #define CONFIG_OPTIMIZATION_LEVEL_DEBUG 1
 #define CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED 1
--- a/tools/sdk/lib/libapp_trace.a
+++ b/tools/sdk/lib/libapp_trace.a
--- a/tools/sdk/lib/libapp_update.a
+++ b/tools/sdk/lib/libapp_update.a
--- a/tools/sdk/lib/libbootloader_support.a
+++ b/tools/sdk/lib/libbootloader_support.a
--- a/tools/sdk/lib/libbt.a
+++ b/tools/sdk/lib/libbt.a
--- a/tools/sdk/lib/libcoap.a
+++ b/tools/sdk/lib/libcoap.a
--- a/tools/sdk/lib/libconsole.a
+++ b/tools/sdk/lib/libconsole.a
--- a/tools/sdk/lib/libcxx.a
+++ b/tools/sdk/lib/libcxx.a
--- a/tools/sdk/lib/libdriver.a
+++ b/tools/sdk/lib/libdriver.a
--- a/tools/sdk/lib/libesp-tls.a
+++ b/tools/sdk/lib/libesp-tls.a
--- a/tools/sdk/lib/libesp32.a
+++ b/tools/sdk/lib/libesp32.a
--- a/tools/sdk/lib/libesp_adc_cal.a
+++ b/tools/sdk/lib/libesp_adc_cal.a
--- a/tools/sdk/lib/libesp_http_client.a
+++ b/tools/sdk/lib/libesp_http_client.a
--- a/tools/sdk/lib/libethernet.a
+++ b/tools/sdk/lib/libethernet.a
--- a/tools/sdk/lib/libexpat.a
+++ b/tools/sdk/lib/libexpat.a
--- a/tools/sdk/lib/libfatfs.a
+++ b/tools/sdk/lib/libfatfs.a
--- a/tools/sdk/lib/libfreertos.a
+++ b/tools/sdk/lib/libfreertos.a
--- a/tools/sdk/lib/libheap.a
+++ b/tools/sdk/lib/libheap.a
--- a/tools/sdk/lib/liblog.a
+++ b/tools/sdk/lib/liblog.a
--- a/tools/sdk/lib/liblwip.a
+++ b/tools/sdk/lib/liblwip.a
--- a/tools/sdk/lib/libmbedtls.a
+++ b/tools/sdk/lib/libmbedtls.a
--- a/tools/sdk/lib/libmdns.a
+++ b/tools/sdk/lib/libmdns.a
--- a/tools/sdk/lib/libnewlib.a
+++ b/tools/sdk/lib/libnewlib.a
--- a/tools/sdk/lib/libnghttp.a
+++ b/tools/sdk/lib/libnghttp.a
--- a/tools/sdk/lib/libnvs_flash.a
+++ b/tools/sdk/lib/libnvs_flash.a
--- a/tools/sdk/lib/libopenssl.a
+++ b/tools/sdk/lib/libopenssl.a
--- a/tools/sdk/lib/libpthread.a
+++ b/tools/sdk/lib/libpthread.a
--- a/tools/sdk/lib/libsdmmc.a
+++ b/tools/sdk/lib/libsdmmc.a
--- a/tools/sdk/lib/libsmartconfig_ack.a
+++ b/tools/sdk/lib/libsmartconfig_ack.a
--- a/tools/sdk/lib/libsoc.a
+++ b/tools/sdk/lib/libsoc.a
--- a/tools/sdk/lib/libspi_flash.a
+++ b/tools/sdk/lib/libspi_flash.a
--- a/tools/sdk/lib/libspiffs.a
+++ b/tools/sdk/lib/libspiffs.a
--- a/tools/sdk/lib/libtcpip_adapter.a
+++ b/tools/sdk/lib/libtcpip_adapter.a
--- a/tools/sdk/lib/libulp.a
+++ b/tools/sdk/lib/libulp.a
--- a/tools/sdk/lib/libvfs.a
+++ b/tools/sdk/lib/libvfs.a
--- a/tools/sdk/lib/libwear_levelling.a
+++ b/tools/sdk/lib/libwear_levelling.a
--- a/tools/sdk/lib/libwpa_supplicant.a
+++ b/tools/sdk/lib/libwpa_supplicant.a
--- a/tools/sdk/lib/libxtensa-debug-module.a
+++ b/tools/sdk/lib/libxtensa-debug-module.a
--- a/tools/sdk/sdkconfig
+++ b/tools/sdk/sdkconfig
@ -217,17 +217,15 @@ CONFIG_SPIRAM_SUPPORT=y
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_BOOT_INIT=
 CONFIG_SPIRAM_USE_MEMMAP=
 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_MEMTEST=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
-CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
+CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=