commit 04fac626d43e530a6d9b6879c7529f60ce435c8c
author Brian Silverman <brians> Sun Jan 26 18:32:15 2014 -0800
committer Brian Silverman <brians> Sun Jan 26 18:32:15 2014 -0800
tree fc13da71bb93e1c30e33d0333d5d2771d1faeac1
parent 5e9a77c74152e5352295dcc85eefebc48b7de222

added support for downloading to our custom bootloader

bbb_cape/src/cape/bootloader.c

diff --git a/bbb_cape/src/cape/bootloader.c b/bbb_cape/src/cape/bootloader.c
index 199a3d1..39f3080 100644
--- a/bbb_cape/src/cape/bootloader.c
+++ b/bbb_cape/src/cape/bootloader.c
@@ -4,6 +4,7 @@
 
 #include "cape/bootloader_handoff.h"
 #include "cape/led.h"
+#include "cape/util.h"
 
 // Actually runs the bootloader code.
 // Implemented in bootloader_impl.c.
@@ -64,6 +65,7 @@
       RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN | RCC_AHB1ENR_GPIOCEN;
   led_init();
   led_set(LED_HB, 1);
+  gpio_set_pupd(GPIOC, 2, 2);
 
   setup_main_clock();
 
@@ -72,8 +74,8 @@
   while (!(SYSCFG->CMPCR & SYSCFG_CMPCR_READY)) {}  // wait for it to be ready
 
   if (GPIOC->IDR & (1 << 2)) {
-    jump_to_main();
-  } else {
     bootloader_start();
+  } else {
+    jump_to_main();
   }
 }