From: Angus Gratton <angus@espressif.com>
Date: Fri, 9 Dec 2016 05:19:09 +0000 (+0800)
Subject: Merge branch 'bugfix/spiflash_erase_block' into 'master'
X-Git-Tag: v2.0-rc1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fd7908bbe6266c9385b7e8765cc0eb90d57e81c;p=esp-idf

Merge branch 'bugfix/spiflash_erase_block' into 'master'

SPI flash: Block erase size 64KB not 32KB

Reverts changes made in 9f9d92b2dfed7e8a2e1ecbcf0bd8e4139abd5372

See merge request !298
---

9fd7908bbe6266c9385b7e8765cc0eb90d57e81c