From: Jiang Jiang Jian <jack@espressif.com>
Date: Fri, 16 Jun 2017 07:04:01 +0000 (+0800)
Subject: Merge branch 'bugfix/spi_flash_large_writes' into 'master'
X-Git-Tag: v2.1-rc1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff6c0a6cc8b3ca89a0ae32c0d7ab6caacb72e51b;p=esp-idf

Merge branch 'bugfix/spi_flash_large_writes' into 'master'

spi_flash: Fix large writes, unaligned writes, and writes from flash

See merge request !843
---

ff6c0a6cc8b3ca89a0ae32c0d7ab6caacb72e51b
diff --cc components/log/include/esp_log.h
index b760dfe614,928fb49051..b3918a93ff
--- a/components/log/include/esp_log.h
+++ b/components/log/include/esp_log.h
@@@ -114,10 -114,10 +114,10 @@@ void esp_log_buffer_hex(const char *tag
   *
   * @param  buffer   Pointer to the buffer array
   *
-  * @param  buff_len length of buffer
+  * @param  buff_len length of buffer in bytes
   *
   */
 -void esp_log_buffer_char(const char *tag, const char *buffer, uint16_t buff_len);
 +void esp_log_buffer_char(const char *tag, const void *buffer, uint16_t buff_len);
  
  #if CONFIG_LOG_COLORS
  #define LOG_COLOR_BLACK   "30"