Merge pull request adafruit#1004 from adafruit/nrf52840_usbboot

Nrf52840 usbboot

.gitattributes

@@ -12,6 +12,7 @@
 *.dxf binary
 *.mpy binary
 *.deb binary
+*.zip binary
 
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text

.gitignore

@@ -7,7 +7,7 @@
 *.bin
 *.map
 *.hex
-!ports/nrf/**/bootloader/*.hex
+!ports/nrf/**/bootloader/**/*.hex
 *.dis
 *.exe
 

.gitmodules

@@ -37,9 +37,9 @@
 	url = https://github.com/micropython/stm32lib
 	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
 [submodule "atmel-samd/asf4"]
-       path = ports/atmel-samd/asf4
-       url = https://github.com/adafruit/asf4.git
-       branch = circuitpython
+	path = ports/atmel-samd/asf4
+	url = https://github.com/adafruit/asf4.git
+	branch = circuitpython
 [submodule "tools/usb_descriptor"]
 	path = tools/usb_descriptor
 	url = https://github.com/adafruit/usb_descriptor.git
@@ -73,3 +73,7 @@
 [submodule "ports/nrf/nrfx"]
 	path = ports/nrf/nrfx
 	url = https://github.com/NordicSemiconductor/nrfx.git
+[submodule "lib/tinyusb"]
+	path = lib/tinyusb
+	url = https://github.com/hathach/tinyusb.git
+	branch = develop

conf.py

@@ -117,6 +117,7 @@
                     "ports/nrf/hal",
                     "ports/nrf/modules",
                     "ports/nrf/nrfx",
+                    "ports/nrf/usb",
                     "ports/pic16bit",
                     "ports/qemu-arm",
                     "ports/stm32",

ports/nrf/Makefile

@@ -1,22 +1,23 @@
-# Select the board to build for: if not given on the command line,
-# then default to feather52832.
-BOARD ?= feather52832
-ifeq ($(wildcard boards/$(BOARD)/.),)
-$(error Invalid BOARD specified)
+# Select the board to build for.
+ifeq ($(BOARD),)
+  $(info You must provide a BOARD parameter with 'BOARD=')
+  $(info Possible values are:)
+  $(info $(sort $(subst /.,,$(subst boards/,,$(wildcard boards/*/.)))))
+  $(error BOARD not defined)
+else
+  ifeq ($(wildcard boards/$(BOARD)/.),)
+    $(error Invalid BOARD specified)
+  endif
 endif
 
-# If SoftDevice is selected, try to use that one.
-# Default to SD132 (exact version can be set with SOFTDEV_VERSION)
-SD ?= s132
-SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
+include boards/$(BOARD)/mpconfigboard.mk
 
-# TODO: Verify that it is a valid target.
+SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
 
-# If the build directory is not given, make it reflect the board name
+# Build directory with SD
 BUILD ?= $(if $(SD),build-$(BOARD)-$(SD_LOWER),build-$(BOARD))
 
 include ../../py/mkenv.mk
-include boards/$(BOARD)/mpconfigboard.mk
 -include mpconfigport.mk
 
 ifneq ($(SD), )
@@ -52,6 +53,8 @@ INC += -I./nrfx/drivers/include
 INC += -I../../lib/mp-readline
 INC += -I./drivers/bluetooth
 INC += -I./drivers
+INC += -I../../lib/tinyusb/src
+INC += -I./usb
 
 NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
 
@@ -87,6 +90,7 @@ LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
 SRC_NRFX = $(addprefix nrfx/,\
+	drivers/src/nrfx_power.c \
 	drivers/src/nrfx_spim.c \
 	drivers/src/nrfx_twim.c \
 	drivers/src/nrfx_uart.c \
@@ -96,10 +100,13 @@ SRC_C += \
 	mphalport.c \
 	fatfs_port.c \
 	tick.c \
+	background.c \
+	internal_flash.c \
 	drivers/bluetooth/ble_drv.c \
 	drivers/bluetooth/ble_uart.c \
 	boards/$(BOARD)/board.c \
 	nrfx/mdk/system_$(MCU_SUB_VARIANT).c \
+	nrfx/hal/nrf_nvmc.c \
 	device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/option/ccsbcs.c \
@@ -108,10 +115,25 @@ SRC_C += \
 	lib/utils/context_manager_helpers.c \
 	lib/utils/interrupt_char.c \
 	lib/utils/pyexec.c \
+	lib/utils/stdout_helpers.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
-	internal_flash.c \
 
+ifeq ($(MCU_SUB_VARIANT),nrf52840)
+
+SRC_C += \
+	usb/tusb_descriptors.c \
+	usb/usb_msc_flash.c \
+	lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c \
+	lib/tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c \
+	lib/tinyusb/src/common/tusb_fifo.c \
+	lib/tinyusb/src/device/usbd.c \
+	lib/tinyusb/src/device/usbd_desc.c \
+	lib/tinyusb/src/class/msc/msc_device.c \
+	lib/tinyusb/src/class/cdc/cdc_device.c \
+	lib/tinyusb/src/tusb.c \
+
+endif
 
 DRIVERS_SRC_C += $(addprefix modules/,\
 	ubluepy/modubluepy.c \
@@ -213,9 +235,9 @@ 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
+.phony: all flash sd binary hex bootloader
 
-all: binary hex
+all: binary hex uf2
 
 OUTPUT_FILENAME = firmware
 
@@ -231,12 +253,18 @@ hex: $(BUILD)/$(OUTPUT_FILENAME).hex
 $(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).elf
 	$(OBJCOPY) -O ihex $< $@
 
+#####################
+# Flash with debugger
+#####################
 FLASHER ?=
 
 ifeq ($(FLASHER),)
 
+# Also update to bootloader settting to validate application and skip checksum ( app valid = 0x0001, crc = 0x0000 )
 flash: $(BUILD)/$(OUTPUT_FILENAME).hex
 	nrfjprog --program $< --sectorerase -f $(MCU_VARIANT)
+	nrfjprog --erasepage $(BOOT_SETTING_ADDR) -f $(MCU_VARIANT)
+	nrfjprog --memwr $(BOOT_SETTING_ADDR) --val 0x00000001 -f $(MCU_VARIANT)
 	nrfjprog --reset -f $(MCU_VARIANT)
 
 sd: $(BUILD)/$(OUTPUT_FILENAME).hex
@@ -245,6 +273,9 @@ 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
@@ -257,6 +288,41 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).hex
 
 endif
 
+#####################
+# Flash with DFU
+#####################
+.phony: dfu-gen dfu-flash dfu-bootloader
+
+ifeq ($(OS),Windows_NT)
+   NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
+else
+   NRFUTIL = nrfutil
+endif
+
+check_defined = \
+    $(strip $(foreach 1,$1, \
+    $(call __check_defined,$1,$(strip $(value 2)))))
+__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
+
+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
+
+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" $^
+
+$(BUILD)/dfu-package.zip: dfu-gen
+
 $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(ECHO) "LINK $@"
 	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) -Wl,--start-group $(LIBS) -Wl,--end-group

ports/nrf/README.md

@@ -28,6 +28,20 @@ This is a port of CircuitPython to the Nordic Semiconductor nRF52 series of chip
 * nRF52840
   * [PCA10056](http://www.nordicsemi.com/eng/Products/nRF52840-Preview-DK)
 
+## Board Specific Instructions
+
+For board-specific instructions on building and flashing CircuitPython, see
+the following links:
+
+> **NOTE**: These board specific readmes may be more up to date than the
+  generic board-neutral documentation further down.
+
+* Adafruit [Feather nRF52](boards/feather52/README.md): 512KB Flash, 64KB SRAM
+* Adafruit [Feather nRF52840](boards/feather52840/README.md): 1MB Flash, 256KB SRAM
+* Nordic PCA10056 see [Feather nRF52840](boards/feather52840/README.md)
+
+For all other board targets, see the generic notes below.
+
 ## Compile and Flash
 
 Prerequisite steps for building the nrf port:

ports/nrf/background.c

@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "tusb.h"
+
+void run_background_tasks(void) {
+#ifdef NRF52840_XXAA
+    tusb_task();
+    tud_cdc_flush();
+#endif
+}

ports/nrf/boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld → ports/nrf/boards/bluefruit_nrf52840_s140_6.0.0.ld

@@ -7,14 +7,13 @@
     ----------  ---------- ------- -----------------------------------------
     0x000FF000..0x000FFFFF (  4KB) Bootloader Settings
     0x000FE000..0x000FEFFF (  4KB) Master Boot Record Params
-    0x000F4000..0x000FDFFF ( 40KB) Serial + OTA Bootloader
+    0x000F4000..0x000FDFFF ( 40KB) Bootloader (UF2 + CDC + OTA)
 
-    0x000F3000..0x000F3FFF ( 4KB ) Private Config Data (Bonding, Keys, etc.)
-    0x000F2000..0x000F2FFF ( 4KB ) User NVM data
-    0x000B2000..0x000F1FFF (256KB) User Filesystem
+    0x000ED000..0x000F3FFF (28KB ) Private Config Data (Bonding, Keys, etc.)
+    0x000AD000..0x000ECFFF (256KB) User Filesystem
 
-    0x00025000..0x000B1FFF (564KB) Application Code (including ISR vector)
-    0x00001000..0x00024FFF (144KB) SoftDevice
+    0x00026000..0x000ACFFF (540KB) Application Code (including ISR vector)
+    0x00001000..0x00025FFF (148KB) SoftDevice
     0x00000000..0x00000FFF   (4KB) Master Boot Record
 */
 
@@ -23,9 +22,9 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x00000000, LENGTH = 0x100000
 
-    FLASH_ISR (rx)  : ORIGIN = 0x00025000, LENGTH = 0x001000
-    FLASH_TEXT (rx) : ORIGIN = 0x00026000, LENGTH = 0x08C000
-    FLASH_FATFS (r) : ORIGIN = 0x000B2000, LENGTH = 0x040000
+    FLASH_ISR (rx)  : ORIGIN = 0x00026000, LENGTH = 0x001000
+    FLASH_TEXT (rx) : ORIGIN = 0x00027000, LENGTH = 0x086000
+    FLASH_FATFS (r) : ORIGIN = 0x000AD000, LENGTH = 0x040000
 
     /* 0x2000000 - RAM:ORIGIN is reserved for Softdevice */
     RAM (xrw)       : ORIGIN = 0x20004000, LENGTH = 0x20040000 - 0x20004000
@@ -42,6 +41,6 @@ _estack = ORIGIN(RAM) + LENGTH(RAM);
 
 /* RAM extents for the garbage collector */
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
-_heap_end = 0x20007000; /* tunable */
+_heap_end = 0x20020000; /* tunable */
 
 INCLUDE "boards/common.ld"

ports/nrf/boards/feather52832/mpconfigboard.mk

@@ -1,37 +1,11 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52
+SD ?= s132
 SOFTDEV_VERSION ?= 2.0.1
 
 LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
-BOOTLOADER_PKG = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single.zip
+BOOT_FILE = boards/feather52832/bootloader/feather52_bootloader_$(SOFTDEV_VERSION)_s132_single
 
+BOOT_SETTING_ADDR = 0x7F000
 NRF_DEFINES += -DNRF52832_XXAA
-
-ifeq ($(OS),Windows_NT)
-   NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
-else
-   NRFUTIL = nrfutil
-endif
-
-CFLAGS += -DADAFRUIT_FEATHER52
-
-check_defined = \
-    $(strip $(foreach 1,$1, \
-    $(call __check_defined,$1,$(strip $(value 2)))))
-__check_defined = \
-    $(if $(value $1),, \
-    $(error Undefined make flag: $1$(if $2, ($2))))
-
-.PHONY: dfu-gen dfu-flash boot-flash
-
-dfu-gen:
-	$(NRFUTIL) dfu genpkg --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
-
-dfu-flash:
-	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
-
-boot-flash:
-	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) dfu serial --package $(BOOTLOADER_PKG) -p $(SERIAL) -b 115200