From cb0b3bc0b7aa2c45196a791a607bd37defc07a02 Mon Sep 17 00:00:00 2001
From: root <root@lamia.panaceas.james.local>
Date: Fri, 4 Sep 2015 11:19:00 +0100
Subject: add timeout mode

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 192bdde..c17d8a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 PROG=main
 
 DEFINES =
+
+#if not defined then we use a timer
+#DEFINES += -DBOOTLOADER_BUTTON=BSP_BUTTON_1
+
+
 DEFINES += -DSWI_DISABLE0
 #DEFINES += -DBOARD_PCA10028
 DEFINES += -DBOARD_BLE400
@@ -61,10 +66,9 @@ DEV_TYPE=0xFFFF
 SD_REQ=0xFFFE
 
 
-LINKER_SCRIPT=dfu_gcc_nrf51.ld #sdk/toolchain/gcc/s130.ld
+LINKER_SCRIPT=dfu_gcc_nrf51.ld 
 
 INCLUDES += -Isdk-config -I${SDK} -I.
-#INCLUDES += -Iconfig
 
 OOCD=openocd
 OOCD_CFG=openocd.cfg
-- 
cgit v1.2.3