From: Ivan Grokhotkov <ivan@espressif.com>
Date: Wed, 22 Feb 2017 06:17:40 +0000 (+0800)
Subject: Merge branch 'bugfix/flash_write_single_core' into 'master'
X-Git-Tag: v2.0-rc2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dca0377e19c6e514c0c694b521c3495a6d46c3af;p=esp-idf

Merge branch 'bugfix/flash_write_single_core' into 'master'

spi_flash: fix protection issues

This MR fixes the two spi_flash related issues:

- esp_intr_noniram_{disable,enable} not being protected by spi_flash_op_{lock,unlock} in single core mode. This caused a safety assert to be triggered in esp_intr_noniram_disable.

- spi_flash_unlock not being protected by spi_flash_guard_{start,end}. This caused a conflict between SPI0 and SPI1 controllers when accessing SPI flash, manifesting in cache data corruption and IllegalInstruction exceptions, for some flash chips.


See merge request !522
---

dca0377e19c6e514c0c694b521c3495a6d46c3af