Ivan Grokhotkov cf22e4445a Merge branch 'master' into feature/logging ... * master: (45 commits) esp32/lib: update to 1303c92c dhcpserver: Fix crash when switching wifi mode mbedtls: Temporarily disable default hardware crypto SHA & bignum mbedtls hwcrypto sha512: Fix redirection of function names mbedtls upstream tweak: Move mbedtls_sha512_process in sha512.h Format code by using 4 spaces instead modify character conversion error and typo modify i2s_reg.h, rebase to master Only modify headers in soc/ . Pass compiling under esp-idf-tests/merge_soc_tmp/merge_for_soc_headers branch.(only change some names of register and INUM). Rename vender_ie_type_t and vendor_ie_id_t to wifi_vendor_ie_type_t and wifi_vendor_ie_id_t respectively modify arguments for vendor ie APIs by using enum instead esp32: fix typo esp32: fix kconfig define lwip task priority in esp_task.h components: esp32 - fix build error components: lwip - Modify lwip task priority and stack definition method components: esp32 components: esp32 components: esp32/lwip task priority: modify lwip/wifi/event task priority ... # Conflicts: # components/bootloader/src/main/bootloader_start.c # components/bootloader/src/main/flash_encrypt.c # components/bootloader/src/main/secure_boot.c # components/esp32/cpu_start.c		2016-09-15 02:15:50 +08:00
..
bootloader	Merge branch 'master' into feature/logging	2016-09-15 02:15:50 +08:00
bt	Initial public version	2016-08-17 23:08:22 +08:00
esp32	Merge branch 'master' into feature/logging	2016-09-15 02:15:50 +08:00
esptool_py	Merge branch 'master' into feature/esptool_upstream	2016-09-12 18:02:10 +10:00
expat	json & expat: Update component.mk after merging from master	2016-09-09 14:07:45 +10:00
freertos	Only modify headers in soc/ .	2016-09-14 13:47:28 +08:00
json	json & expat: Update component.mk after merging from master	2016-09-09 14:07:45 +10:00
log	components/log: add implementation, update a few components to use it	2016-09-15 00:53:33 +08:00
lwip	Merge remote-tracking branch 'origin/feature/mbedtls'	2016-09-14 18:05:56 +08:00
mbedtls	mbedtls: Temporarily disable default hardware crypto SHA & bignum	2016-09-14 17:52:39 +10:00
newlib	Name component makefiles component.mk instead of Makefile	2016-09-08 13:41:19 +10:00
nvs_flash	Name component makefiles component.mk instead of Makefile	2016-09-08 13:41:19 +10:00
partition_table	Remove bin/ directory in favour of an add_path.sh script that can be sourced	2016-09-01 18:45:10 +10:00
spi_flash	Only modify headers in soc/ .	2016-09-14 13:47:28 +08:00
tcpip_adapter	header: format and fix typos	2016-09-13 16:17:41 +08:00