summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorroot <root@lamia.panaceas.james.local>2015-09-04 11:34:36 +0100
committerroot <root@lamia.panaceas.james.local>2015-09-04 11:34:36 +0100
commit1f2ed6c14453d261209ee8c29e5af74c35e44e48 (patch)
tree955b4480811ff1eb1ea1e681341b732a31039996 /Makefile
parent4eb753e7170969c9ba9ad3d914f74f60c13836ae (diff)
downloadblinky-1f2ed6c14453d261209ee8c29e5af74c35e44e48.tar.gz
blinky-1f2ed6c14453d261209ee8c29e5af74c35e44e48.tar.bz2
blinky-1f2ed6c14453d261209ee8c29e5af74c35e44e48.zip
workingHEADmaster
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 17 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f258e30..5f21816 100644
--- a/Makefile
+++ b/Makefile
@@ -132,13 +132,6 @@ ${PROG}:${OBJS}
$(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
-flash: ${PROG}.hex
- ${OOCD} -f ${OOCD_CFG} \
- -c "init" -c "reset init" \
- -c "flash write_image erase $<" \
- -c "reset" \
- -c "shutdown"
-
ds:
$(OOCD) -f $(OOCD_CFG)
@@ -156,6 +149,23 @@ reset:
%.zip: %.hex
${NRFUTIL} dfu genpkg --dev-revision ${DEV_REVISION} --dev-type ${DEV_TYPE} --application-version ${APP_VERSION} --sd-req ${SD_REQ} --application $< $@
+flash: ${PROG}.hex
+ ${OOCD} -f ${OOCD_CFG} \
+ -c "init" -c "reset init" \
+ -c "flash write_image erase $<" \
+ -c "reset" \
+ -c "shutdown"
+
+
+
+flash_softdevice: ${SOFTDEVICE}
+ ${OOCD} -f ${OOCD_CFG} \
+ -c "init" -c "reset init" \
+ -c "nrf51 mass_erase" \
+ -c "flash write_image erase $<" \
+ -c "reset" \
+ -c "shutdown"
+
dfu: ${PROG}.zip
nrfdfu -b ${BDADDR} -p ${PROG}.zip