From 32744a04e1334bfa9cbee0e487a19f52eee44d6f Mon Sep 17 00:00:00 2001 From: JoeBakalor Date: Fri, 13 Dec 2019 09:08:21 -0500 Subject: update bluebird make file --- ports/atmel-samd/peripherals | 2 +- ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index 4c0deecf8..2ba5b20ba 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit 4c0deecf889da0074c1dbc9a5e2d24cb7c7a31c6 +Subproject commit 2ba5b20ba725e1c91c77875fba3a5e22059cdb92 diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk index c99b33f3d..3f97b0821 100644 --- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk +++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk @@ -1,22 +1,8 @@ USB_VID = 0x239A USB_PID = 0x802A -USB_PRODUCT = "Bluebird" -USB_MANUFACTURER = "Teknikio" +USB_PRODUCT = "PCA10059" +USB_MANUFACTURER = "Nordic Semiconductor" -MCU_SERIES = m4 -MCU_VARIANT = nrf52 -MCU_SUB_VARIANT = nrf52840 MCU_CHIP = nrf52840 -SD ?= s140 -SOFTDEV_VERSION ?= 6.1.0 -BOOT_SETTING_ADDR = 0xFF000 - -ifeq ($(SD),) - LD_FILE = boards/nrf52840_1M_256k.ld -else - LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld - CIRCUITPY_BLEIO = 1 -endif - -NRF_DEFINES += -DNRF52840_XXAA -DNRF52840 +INTERNAL_FLASH_FILESYSTEM = 1 -- cgit v1.2.3