From a1a79b05fd4842d9b850b9a5830fe1283ba5c5fe Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Sun, 27 Oct 2019 10:17:13 -0400
Subject: [PATCH] fix solo locked flag for bootloader

---
 targets/stm32l432/bootloader/bootloader.h | 5 +++++
 targets/stm32l432/src/app.h               | 2 --
 targets/stm32l432/src/device.c            | 2 ++
 targets/stm32l432/src/flash.c             | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/targets/stm32l432/bootloader/bootloader.h b/targets/stm32l432/bootloader/bootloader.h
index 8702f87..4c0b5a6 100644
--- a/targets/stm32l432/bootloader/bootloader.h
+++ b/targets/stm32l432/bootloader/bootloader.h
@@ -64,4 +64,9 @@ int is_authorized_to_boot();
 int is_bootloader_disabled();
 void bootloader_heartbeat();
 
+// Return 1 if Solo is secure/locked.
+int solo_is_locked();
+
+
+
 #endif
diff --git a/targets/stm32l432/src/app.h b/targets/stm32l432/src/app.h
index 6b0dbe8..ecda68b 100644
--- a/targets/stm32l432/src/app.h
+++ b/targets/stm32l432/src/app.h
@@ -83,6 +83,4 @@ int solo_is_locked();
 #define SKIP_BUTTON_CHECK_WITH_DELAY        0
 #define SKIP_BUTTON_CHECK_FAST              0
 
-#define SOLO_FLAG_LOCKED                    0x2
-
 #endif
diff --git a/targets/stm32l432/src/device.c b/targets/stm32l432/src/device.c
index dee0fc7..bba0137 100644
--- a/targets/stm32l432/src/device.c
+++ b/targets/stm32l432/src/device.c
@@ -34,6 +34,8 @@
 #define LOW_FREQUENCY        1
 #define HIGH_FREQUENCY       0
 
+#define SOLO_FLAG_LOCKED                    0x2
+
 void wait_for_usb_tether(void);
 
 
diff --git a/targets/stm32l432/src/flash.c b/targets/stm32l432/src/flash.c
index 355b206..92395f1 100644
--- a/targets/stm32l432/src/flash.c
+++ b/targets/stm32l432/src/flash.c
@@ -13,7 +13,6 @@
 #include "flash.h"
 #include "log.h"
 #include "device.h"
-#include "app.h"
 
 static void flash_lock(void)
 {