From: Angus Gratton <angus@espressif.com>
Date: Tue, 19 Mar 2019 23:28:09 +0000 (+0800)
Subject: Merge branch 'bugfix/error_in_bootloader_loadprohibited' into 'master'
X-Git-Tag: v4.0-beta1~500
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7b5c3a8c75e8e805214c6ef83e72b1e5e37aa38;p=esp-idf

Merge branch 'bugfix/error_in_bootloader_loadprohibited' into 'master'

esp_tool: Exclude elf-sha256 from bootloader

Closes IDFGH-690

See merge request idf/esp-idf!4520
---

b7b5c3a8c75e8e805214c6ef83e72b1e5e37aa38