]> granicus.if.org Git - esp-idf/commit
Merge branch 'bugfix/spiflash_erase_block' into 'master'
authorAngus Gratton <angus@espressif.com>
Fri, 9 Dec 2016 05:19:09 +0000 (13:19 +0800)
committerAngus Gratton <angus@espressif.com>
Fri, 9 Dec 2016 05:19:09 +0000 (13:19 +0800)
commit9fd7908bbe6266c9385b7e8765cc0eb90d57e81c
tree5c53cd879084c516b0a36a60dcdd40b812699a4a
parentcf311d81ee33839a44d4bdd87bb086570c6efcbe
parent8ba75a1e9f6fbbf962c4f95afa060dcf38dd7a58
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