Merge pull request #1137 from hathach/nrf52_dfu_touch1200

Nrf52 dfu touch1200, remove bootloader target

Author: dhalbert

lib/tinyusb

@@ -248,7 +248,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 $(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
 $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
 
-.phony: all flash sd binary hex bootloader
+.phony: all flash sd binary hex
 
 all: binary hex uf2
 
@@ -266,6 +266,11 @@ hex: $(BUILD)/$(OUTPUT_FILENAME).hex
 $(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).elf
 	$(OBJCOPY) -O ihex $< $@
 
+## Create uf2 file
+uf2: $(BUILD)/$(OUTPUT_FILENAME).hex
+	$(ECHO) "Create $(OUTPUT_FILENAME).uf2"
+	$(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" $^
+
 #####################
 # Flash with debugger
 #####################
@@ -286,9 +291,6 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).hex
 	nrfjprog --program $< --sectorerase -f $(MCU_VARIANT)
 	nrfjprog --reset -f $(MCU_VARIANT)
 
-bootloader:
-	nrfjprog --program $(BOOT_FILE).hex -f nrf52 --chiperase --reset
-
 else ifeq ($(FLASHER), pyocd)
 
 flash: $(BUILD)/$(OUTPUT_FILENAME).hex
@@ -303,21 +305,19 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).hex
 	pyocd-flashtool -t $(MCU_SUB_VARIANT) $< --sector_erase
 	pyocd-tool -t $(MCU_SUB_VARIANT) reset $(BOOT_SETTING_ADDR)
 
-bootloader:
-	pyocd-flashtool -t $(MCU_SUB_VARIANT) $(BOOT_FILE).hex --chip_erase
-	pyocd-tool -t $(MCU_SUB_VARIANT) reset
-
 endif
 
 #####################
 # Flash with DFU
 #####################
-.phony: dfu-gen dfu-flash dfu-bootloader
+.phony: dfu-gen dfu-flash
+
+NRFUTIL = adafruit-nrfutil
 
-ifeq ($(OS),Windows_NT)
-   NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
+ifeq ($(MCU_SUB_VARIANT),nrf52840)
+	DFU_TOUCH = --touch 1200
 else
-   NRFUTIL = nrfutil
+	DFU_TOUCH =
 endif
 
 check_defined = \
@@ -327,22 +327,16 @@ __check_defined = \
     $(if $(value $1),, \
     $(error Undefined make flag: $1$(if $2, ($2))))
 
-dfu-gen: $(BUILD)/$(OUTPUT_FILENAME).hex
-	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
-
+## Flash with DFU serial
 dfu-flash: $(BUILD)/dfu-package.zip
 	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank
-
-dfu-bootloader:
-	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
-	$(NRFUTIL) --verbose dfu serial --package $(BOOT_FILE).zip -p $(SERIAL) -b 115200
+	$(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
 
-uf2: $(BUILD)/$(OUTPUT_FILENAME).hex
-	$(ECHO) "Create $(OUTPUT_FILENAME).uf2"
-	$(PYTHON2) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/$(OUTPUT_FILENAME).uf2" $^
+## Create DFU package file
+dfu-gen: $(BUILD)/dfu-package.zip 
 
-$(BUILD)/dfu-package.zip: dfu-gen
+$(BUILD)/dfu-package.zip: $(BUILD)/$(OUTPUT_FILENAME).hex
+	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
 
 $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(ECHO) "LINK $@"

ports/nrf/Makefile

@@ -79,6 +79,7 @@ Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Flash
 pca10040             | s132                    | Peripheral and Scanner | [Segger](#segger-targets)
 feather52832         | s132                    | Peripheral and Scanner | [UART DFU](#dfu-targets)
 pca10056             | s140                    | Peripheral and Scanner | [Segger](#segger-targets)
+feather52840         | s140                    | Peripheral and Scanner | [UART DFU](#dfu-targets)
 
 ## Segger Targets
 
@@ -98,11 +99,9 @@ note: On Linux it might be required to link SEGGER's `libjlinkarm.so` inside nrf
 
 ## DFU Targets
 
-    sudo apt-get install build-essential libffi-dev pkg-config gcc-arm-none-eabi git python python-pip
-    git clone https://github.com/adafruit/Adafruit_nRF52_Arduino.git
-    cd Adafruit_nRF52_Arduino/tools/nrfutil-0.5.2/
-    sudo pip install -r requirements.txt
-    sudo python setup.py install
+run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) from PyPi
+
+    $ pip3 install --user adafruit-nrfutil
 
 **make flash** and **make sd** will not work with DFU targets. Hence, **dfu-gen** and **dfu-flash** must be used instead.
 * dfu-gen: Generates a Firmware zip to be used by the DFU flash application.
@@ -111,8 +110,7 @@ note: On Linux it might be required to link SEGGER's `libjlinkarm.so` inside nrf
 Example on how to generate and flash feather52832 target:
 
     make BOARD=feather52832 SD=s132
-    make BOARD=feather52832 SD=s132 dfu-gen
-    make BOARD=feather52832 SD=s132 dfu-flash
+    make BOARD=feather52832 SD=s132 dfu-gen dfu-flash
 
 ## Bluetooth LE REPL
 

ports/nrf/README.md

@@ -21,24 +21,15 @@ $ cd ports/nrf
 $ ./drivers/bluetooth/download_ble_stack.sh
 ```
 
-## Installing `nrfutil`
+## Installing `adafruit-nrfutil`
 
 The Adafruit Bluefruit nRF52 Feather ships with a serial and OTA BLE bootloader
 that can be used to flash firmware images over a simple serial connection,
 using the on-board USB serial converter.
 
-If you haven't installed this command-line tool yet, go to the `/libs/nrfutil`
-folder (where nrfutil 0.5.2 is installed as a sub-module) and run the following
-commands:
+run following command to install [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) from PyPi
 
-> If you get a 'sudo: pip: command not found' error running 'sudo pip install',
-you can install pip via 'sudo easy_install pip'
-
-```
-$ cd ../../lib/nrfutil
-$ sudo pip install -r requirements.txt
-$ sudo python setup.py install
-```
+    $ pip3 install --user adafruit-nrfutil
 
 # Building and flashing firmware images
 
@@ -75,7 +66,7 @@ You can then connect over BLE UART using an application like Bluefruit LE
 Connect, available for Android, iOS and OS X, or any other application that
 supports the NUS service and allows you to send the corrent EOL sequence.
 
-## Flashing binaries with `nrfutil`
+## Flashing binaries with `adafruit-nrfutil`
 
 ### 1. **Update bootloader** to single-bank version
 
@@ -90,20 +81,25 @@ Due to the size of CircuitPython, we must migrate this bootloader to a
 bootloader from the dual-bank version that ships on Arduino-based Adafruit
 Feather52 boards to a single-bank CircuitPython compatible version:
 
+Firstly clone the [Adafruit_nRF52_Bootloader](https://github.com/adafruit/Adafruit_nRF52_Bootloader.git) and enter its directory
+
+	$ git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader.git
+    $ cd Adafruit_nRF52_Bootloader
+
 #### S132 v2.0.1 single-bank (recommended):
 
-By default s132 v2.0.1 is used when no `SOFTDEV_VERSION` field is passed in:
+To flash bootloader with s132 v2.0.1
 
 ```
-$ make BOARD=feather52832 SERIAL=/dev/tty.SLAB_USBtoUART boot-flash
+$ make BOARD=feather_nrf52832 VERSION=2.0.1 SERIAL=/dev/tty.SLAB_USBtoUART dfu-flash
 ```
 
 #### S132 v5.0.0 (BLE5, experimental):
 
-To enable BLE5 support and the latest S132 release, flash the v5.0.0 bootloader via:
+To flash bootloader with s132 v5.0.0
 
 ```
-$ make BOARD=feather52832 SERIAL=/dev/tty.SLAB_USBtoUART SOFTDEV_VERSION=5.0.0 boot-flash
+$ make BOARD=feather52832 VERSION=5.0.0 SERIAL=/dev/tty.SLAB_USBtoUART dfu-flash
 ```
 
 ### 2. Generate and flash a CircuitPython DFU .zip package over serial

ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld renamed to ports/nrf/boards/adafruit_nrf52840_s140_v6.ld

@@ -5,7 +5,6 @@ SD ?= s132
 SOFTDEV_VERSION ?= 2.0.1
 
 LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
-BOOT_FILE = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single
 
 BOOT_SETTING_ADDR = 0x7F000
 NRF_DEFINES += -DNRF52832_XXAA