diff options
| author | root <root@lamia.panaceas.james.local> | 2015-09-07 13:14:46 +0100 |
|---|---|---|
| committer | root <root@lamia.panaceas.james.local> | 2015-09-07 13:14:46 +0100 |
| commit | 70af01e8de04f743f69c97048285c23e5234aa6f (patch) | |
| tree | 3504a23b6a93ad3c1b8c2b486cd8345c7fd82219 /bootloader | |
| parent | 66dee77d69889528d3d755e7fd19005bdd57a077 (diff) | |
| download | bracelet-70af01e8de04f743f69c97048285c23e5234aa6f.tar.gz bracelet-70af01e8de04f743f69c97048285c23e5234aa6f.tar.bz2 bracelet-70af01e8de04f743f69c97048285c23e5234aa6f.zip | |
working_bracelet
Diffstat (limited to 'bootloader')
| -rw-r--r-- | bootloader/Makefile | 5 | ||||
| -rw-r--r-- | bootloader/openocd.cfg | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile index 1468a82..8e6e268 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -72,7 +72,7 @@ LINKER_SCRIPT=dfu_gcc_nrf51.ld INCLUDES += -Isdk-config -I${SDK} -I. -I.. OOCD=openocd -OOCD_CFG=openocd.cfg +OOCD_CFG=../openocd.cfg CROSS=arm-none-eabi- @@ -130,9 +130,6 @@ ${PROG}:${OBJS} $(OBJCOPY) -O ihex $< $@ -twongle.o:twongle.c - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< - %.o:%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< diff --git a/bootloader/openocd.cfg b/bootloader/openocd.cfg deleted file mode 100644 index 0ade377..0000000 --- a/bootloader/openocd.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# nF51822 Target -source [find interface/stlink-v2.cfg] - -#source [find interface/jlink.cfg] -#transport select swd - - -set WORKAREASIZE 0x4000 -source [find target/nrf51.cfg] - -# use hardware reset, connect under reset -#reset_config srst_only srst_nogate |