flash SD along with application with flash target

Author: hathach

nRF51822/projects/Makefile.common

@@ -16,7 +16,6 @@ else
   GNU_VERSION := 4.8.3
   GNU_PREFIX := arm-none-eabi
   NRFJPROG = $(ROOT_PATH)tools/OSX/rknrfgo/nrfjprog
-  @chmod 755 $(NRFJPROG)
 endif
 
 
@@ -170,7 +169,16 @@ clean:
 ## Program device
 .PHONY: flash
 flash: $(OUTPUT_BINARY_DIRECTORY)/$(OUTPUT_FILENAME).hex
+	@echo ""
+ifeq ($(OS),Windows_NT)
+	$(NRFJPROG) -e --programs $(SOFTDEVICE)
 	$(NRFJPROG) --reset --program $(OUTPUT_BINARY_DIRECTORY)/$(OUTPUT_FILENAME).hex
+else
+	@echo "Writing SoftDevice and User Code to Flash Memory"
+	@chmod 755 $(NRFJPROG)
+	$(NRFJPROG) wipe
+	$(NRFJPROG) program -S s110 -s $(SOFTDEVICE) -c $(OUTPUT_BINARY_DIRECTORY)/$(OUTPUT_FILENAME).hex
+endif
 
 .PHONY: reset
 reset:

nRF51822/projects/hrm/Makefile

@@ -44,6 +44,7 @@ C_SOURCE_FILES += nrf_delay.c
 # Make sure we're pointing to the right SDK version
 ROOT_PATH = ../../
 SDK_PATH = $(ROOT_PATH)lib/sdk/nRF51_SDK_v5.2.0.39364/Nordic/nrf51822/
+SOFTDEVICE = $(ROOT_PATH)lib/softdevice/s110_nrf51822_6.0.0/s110_nrf51822_6.0.0_softdevice.hex
 
 # Include the correct SoftDevice header files
 INCLUDEPATHS += -I"$(ROOT_PATH)lib/softdevice/s110_nrf51822_6.0.0/s110_nrf51822_6.0.0_API/include"

nRF51822/projects/uartservice/Makefile

@@ -51,6 +51,7 @@ C_SOURCE_FILES += nrf_delay.c
 # Make sure we're pointing to the right SDK version
 ROOT_PATH = ../../
 SDK_PATH = $(ROOT_PATH)lib/sdk/nRF51_SDK_v5.2.0.39364/Nordic/nrf51822/
+SOFTDEVICE = $(ROOT_PATH)lib/softdevice/s110_nrf51822_6.0.0/s110_nrf51822_6.0.0_softdevice.hex
 
 # Include the correct SoftDevice header files
 INCLUDEPATHS += -I"$(ROOT_PATH)lib/softdevice/s110_nrf51822_6.0.0/s110_nrf51822_6.0.0_API/include"