From 9ec9b67fe6ff32efa94a912917adb2d2d16a4b31 Mon Sep 17 00:00:00 2001
From: Peter Antypas <peter.antypas@gmail.com>
Date: Sun, 3 Jul 2016 20:01:27 -0700
Subject: [PATCH] More bootloader cleanup

---
 bootloader/src/main.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/bootloader/src/main.cpp b/bootloader/src/main.cpp
index b4e1bd5..0893666 100644
--- a/bootloader/src/main.cpp
+++ b/bootloader/src/main.cpp
@@ -57,23 +57,20 @@ void erase()
     FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
 }
 
-int
-main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
-    //erase();
   /*
    *  - Read page at METADATA_ADDRESS, look for software metadata
    *  - If no metadata is present, enter UART interactive mode and wait for software upload
    *  - If metadata is present, jump to software start address (APPLICATION_ADDRESS)
    */
-#if 1
+
    ApplicationMetadata *metadata = (ApplicationMetadata*)METADATA_ADDRESS;
    if ( metadata == NULL || metadata->magic != METADATA_MAGIC ) {
        trace_printf("There is no software installed. Entering UART mode\n");
        enterUARTMode();
 
    }
-//#if 0
    else {
 
        if ( !verifyApplicationChecksum(*metadata) ) {
@@ -81,21 +78,17 @@ main(int argc, char* argv[])
            enterUARTMode();
        }
    }
-//#endif
 
-   trace_printf("Found software rev. %s\n", metadata->revision);
-#endif
 
    pFunction start = (pFunction)(*(__IO uint32_t*) (APPLICATION_ADDRESS + 4));
-   trace_printf("Application address: 0x%.8x\n", APPLICATION_ADDRESS);
-   trace_printf("Jump address: 0x%.8x\n", start);
-
    __timer.start();
 
    Timer::sleep(2000);
 
    jump();
-   //while(1);
+
+   // This should never be reached
+   while(1);
 }
 
 void jump()