From e50d9c0edf0015d148b0db1190e9cc51ebf8b54d Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 10 Jun 2014 14:53:24 +0200
Subject: [PATCH] Fixes #1241 - Revert "Bootloader now accessible with left OR
 right trim inwards"

This reverts commit 54447a45a0671600a70adf2cc24de29a1f447a49.
---
 radio/src/loadboot.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/radio/src/loadboot.cpp b/radio/src/loadboot.cpp
index 03f928480..947b75d05 100644
--- a/radio/src/loadboot.cpp
+++ b/radio/src/loadboot.cpp
@@ -100,28 +100,30 @@ void _bootStart()
     bwdt_reset();
   }
 
-  if (((GPIOC->IDR & 0x00000002) == 0) || ((GPIOE->IDR & 0x00000008) == 0)) {
-    // Bootloader needed
-    const uint8_t *src;
-    uint8_t *dest;
-    uint32_t size;
+  if ((GPIOE->IDR & 0x00000008) == 0) {
+    if ((GPIOC->IDR & 0x00000002) == 0) {
+      // Bootloader needed
+      const uint8_t *src;
+      uint8_t *dest;
+      uint32_t size;
 
-    bwdt_reset();
-    size = sizeof(BootCode);
-    src = BootCode;
-    dest = (uint8_t *) 0x20000000;
+      bwdt_reset();
+      size = sizeof(BootCode);
+      src = BootCode;
+      dest = (uint8_t *) 0x20000000;
+
+      for (; size; size -= 1) {
+        *dest++ = *src++;
+      }
+      // Could check for a valid copy to RAM here
+      // Go execute bootloader
+      bwdt_reset();
+
+      uint32_t address = *(uint32_t *) 0x20000004;
+
+      ((void (*)(void)) (address))();		// Go execute the loaded application
 
-    for (; size; size -= 1) {
-      *dest++ = *src++;
     }
-    // Could check for a valid copy to RAM here
-    // Go execute bootloader
-    bwdt_reset();
-
-    uint32_t address = *(uint32_t *) 0x20000004;
-
-    ((void (*)(void)) (address))();		// Go execute the loaded application
-
   }
 
 // run_application() ;