From: Angus Gratton <angus@espressif.com>
Date: Tue, 29 Aug 2017 00:44:13 +0000 (+0800)
Subject: Merge branch 'bugfix/secure_boot_enable' into 'master'
X-Git-Tag: v3.1-dev~358
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c992f872f4778f2dc75f9bd4384c836aa9d4a5b;p=esp-idf

Merge branch 'bugfix/secure_boot_enable' into 'master'

Fix regression when enabling secure boot

See merge request !1120
---

3c992f872f4778f2dc75f9bd4384c836aa9d4a5b