updates to bluebird

6 files changed, 39 insertions, 79 deletions

diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/pca10056/mpconfigboard.h
index 5b30c7fe8..b34bc8326 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -24,42 +24,40 @@
  * THE SOFTWARE.
  */
 
-#include "nrfx/hal/nrf_gpio.h"
-
-#define MICROPY_HW_BOARD_NAME       "PCA10056 nRF52840-DK"
-#define MICROPY_HW_MCU_NAME         "nRF52840"
-
-#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
-
-#define MICROPY_HW_LED_STATUS          (&pin_P0_13)
-
-#define DEFAULT_I2C_BUS_SCL         (&pin_P0_27)
-#define DEFAULT_I2C_BUS_SDA         (&pin_P0_26)
-
-#define DEFAULT_SPI_BUS_SCK         (&pin_P1_15)
-#define DEFAULT_SPI_BUS_MOSI        (&pin_P1_13)
-#define DEFAULT_SPI_BUS_MISO        (&pin_P1_14)
-
-#define DEFAULT_UART_BUS_RX         (&pin_P1_01)
-#define DEFAULT_UART_BUS_TX         (&pin_P1_02)
-
-// Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.
-// A pin config is valid if it is defined and its value is not 0xFF.
-// Quad   mode: If all DATA0 --> DATA3 are valid
-// Dual   mode: If DATA0 and DATA1 are valid while either DATA2 and/or DATA3 are invalid
-// Single mode: If only DATA0 is valid
-#if QSPI_FLASH_FILESYSTEM
-#define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 20)
-#define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(0, 21)
-#define MICROPY_QSPI_DATA2                NRF_GPIO_PIN_MAP(0, 22)
-#define MICROPY_QSPI_DATA3                NRF_GPIO_PIN_MAP(0, 23)
-#define MICROPY_QSPI_SCK                  NRF_GPIO_PIN_MAP(0, 19)
-#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
-#endif
-
-#if SPI_FLASH_FILESYSTEM
-#define SPI_FLASH_MOSI_PIN &pin_P0_20
-#define SPI_FLASH_MISO_PIN &pin_P0_21
-#define SPI_FLASH_SCK_PIN &pin_P0_19
-#define SPI_FLASH_CS_PIN &pin_P0_17
-#endif
+ #include "nrfx/hal/nrf_gpio.h"
+
+ #define MICROPY_HW_BOARD_NAME       "PCA10056 nRF52840-DK"
+ #define MICROPY_HW_MCU_NAME         "nRF52840"
+
+ #define MICROPY_HW_LED_STATUS          (&pin_P0_13)
+
+ #define DEFAULT_I2C_BUS_SCL         (&pin_P0_27)
+ #define DEFAULT_I2C_BUS_SDA         (&pin_P0_26)
+
+ #define DEFAULT_SPI_BUS_SCK         (&pin_P1_15)
+ #define DEFAULT_SPI_BUS_MOSI        (&pin_P1_13)
+ #define DEFAULT_SPI_BUS_MISO        (&pin_P1_14)
+
+ #define DEFAULT_UART_BUS_RX         (&pin_P1_01)
+ #define DEFAULT_UART_BUS_TX         (&pin_P1_02)
+
+ // Flash operation mode is determined by MICROPY_QSPI_DATAn pin configuration.
+ // A pin config is valid if it is defined and its value is not 0xFF.
+ // Quad   mode: If all DATA0 --> DATA3 are valid
+ // Dual   mode: If DATA0 and DATA1 are valid while either DATA2 and/or DATA3 are invalid
+ // Single mode: If only DATA0 is valid
+ #if QSPI_FLASH_FILESYSTEM
+ #define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 20)
+ #define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(0, 21)
+ #define MICROPY_QSPI_DATA2                NRF_GPIO_PIN_MAP(0, 22)
+ #define MICROPY_QSPI_DATA3                NRF_GPIO_PIN_MAP(0, 23)
+ #define MICROPY_QSPI_SCK                  NRF_GPIO_PIN_MAP(0, 19)
+ #define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 17)
+ #endif
+
+ #if SPI_FLASH_FILESYSTEM
+ #define SPI_FLASH_MOSI_PIN &pin_P0_20
+ #define SPI_FLASH_MISO_PIN &pin_P0_21
+ #define SPI_FLASH_SCK_PIN &pin_P0_19
+ #define SPI_FLASH_CS_PIN &pin_P0_17
+ #endif
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 723e7976e..8fd1ef08d 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -3,23 +3,7 @@ USB_PID = 0x802A
 USB_PRODUCT = "PCA10056"
 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
 
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/pca10059/mpconfigboard.h
index b79d3c88f..18aa66f16 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.h
+++ b/ports/nrf/boards/pca10059/mpconfigboard.h
@@ -28,5 +28,3 @@
 #define MICROPY_HW_MCU_NAME         "nRF52840"
 
 #define MICROPY_HW_LED_STATUS          (&pin_P0_06)
-
-#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index db9d80668..3f97b0821 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -3,21 +3,6 @@ USB_PID = 0x802A
 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
-BOOT_FILE = boards/$(BOARD)/bootloader/$(SOFTDEV_VERSION)/$(BOARD)_bootloader_$(SOFTDEV_VERSION)_s140
-
-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
diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
index 2b8707ad0..76e772ca9 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h
@@ -33,8 +33,6 @@
 #define MICROPY_HW_BOARD_NAME       "Teknikio Bluebird"
 #define MICROPY_HW_MCU_NAME         "nRF52840"
 
-#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
-
 #define MICROPY_HW_NEOPIXEL         (&pin_P0_26)
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_P0_27)
@@ -47,4 +45,4 @@
 #define DEFAULT_UART_BUS_RX         (&pin_P1_07)
 #define DEFAULT_UART_BUS_TX         (&pin_P1_08)
 
-#define BOARD_HAS_CRYSTAL 1  // according to the schematic we do
\ No newline at end of file
+#define BOARD_HAS_CRYSTAL 1  // according to the schematic we do
diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
index c2b8b7605..c99b33f3d 100644
--- a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
+++ b/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk
@@ -20,6 +20,3 @@ else
 endif
 
 NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
-
-INTERNAL_FLASH_FILESYSTEM = 1
-