From: Luo Ji <ji.luo@nxp.com>
Date: Thu, 11 Jan 2018 08:49:03 +0000 (+0800)
Subject: MA-11108 [Android] decrypt lock store fail on imx7d
X-Git-Tag: rel_imx_4.9.88_2.0.0_ga~98
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=5dc5928065eae66012e62f82d5e17d07de926dc0;p=u-boot.git

MA-11108 [Android] decrypt lock store fail on imx7d

Macro FASTBOOT_ENCRYPT_LOCK can't be enabled because
of the order of header files.

Change-Id: Id46b2f595e316b70b71ec957d196e36b9eecc297
Signed-off-by: Luo Ji <ji.luo@nxp.com>
---

diff --git a/drivers/usb/gadget/fastboot_lock_unlock.c b/drivers/usb/gadget/fastboot_lock_unlock.c
index d990095f13..d14e477323 100644
--- a/drivers/usb/gadget/fastboot_lock_unlock.c
+++ b/drivers/usb/gadget/fastboot_lock_unlock.c
@@ -27,10 +27,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <fsl_fastboot.h>
-#include "fastboot_lock_unlock.h"
-
 #include <common.h>
 #include <mapmem.h>
 #include <linux/types.h>
@@ -39,6 +35,8 @@
 #include <ext_common.h>
 #include <stdio_dev.h>
 #include <stdlib.h>
+#include "fastboot_lock_unlock.h"
+#include <fsl_fastboot.h>
 
 #ifdef FASTBOOT_ENCRYPT_LOCK