Merge branch 'master' into nrf52840_usbboot

27 files changed, 86 insertions, 1610 deletions

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index aa7921587..08e26e47f 100755
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -43,9 +43,7 @@ INC += -I$(BUILD)
 INC += -I$(BUILD)/genhdr
 INC += -I./../../lib/cmsis/inc
 INC += -I./boards/$(BOARD)
-INC += -I./hal
 INC += -I./modules/ubluepy
-INC += -I./modules/random
 INC += -I./modules/ble
 INC += -I./nrfx
 INC += -I./nrfx/hal
@@ -65,7 +63,6 @@ CFLAGS += $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(COPT) $(NRF_DEFINES)
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -fstack-usage -fno-builtin -fshort-enums
 CFLAGS += -fdata-sections -ffunction-sections
-CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
 CFLAGS += -D__START=main
 
 LDFLAGS = $(CFLAGS)
@@ -91,10 +88,6 @@ LIBS := -L $(dir $(LIBM_FILE_NAME)) -lm
 LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
-SRC_HAL = $(addprefix hal/,\
-	hal_rng.c \
-	)
-
 SRC_NRFX = $(addprefix nrfx/,\
 	drivers/src/nrfx_power.c \
 	drivers/src/nrfx_spim.c \
@@ -105,12 +98,9 @@ SRC_NRFX = $(addprefix nrfx/,\
 SRC_C += \
 	mphalport.c \
 	fatfs_port.c \
-	fifo.c \
 	tick.c \
 	background.c \
 	internal_flash.c \
-	drivers/softpwm.c \
-	drivers/ticker.c \
 	drivers/bluetooth/ble_drv.c \
 	drivers/bluetooth/ble_uart.c \
 	boards/$(BOARD)/board.c \
@@ -156,7 +146,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	ubluepy/ubluepy_scanner.c \
 	ubluepy/ubluepy_scan_entry.c \
 	ble/modble.c \
-	random/modrandom.c \
 	)
 
 SRC_COMMON_HAL += \
@@ -222,7 +211,8 @@ SRC_SHARED_BINDINGS = \
 	bitbangio/__init__.c \
 	bitbangio/I2C.c \
 	bitbangio/SPI.c \
-	bitbangio/OneWire.c
+	bitbangio/OneWire.c \
+	random/__init__.c
 
 
 SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_BINDINGS)) \
@@ -235,7 +225,6 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
 
 OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(BUILD)/pins_gen.o
-OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
diff --git a/ports/nrf/boards/feather52832/nrf52_hal_conf.h b/ports/nrf/boards/feather52832/nrf52_hal_conf.h
deleted file mode 100644
index fd6073a18..000000000
--- a/ports/nrf/boards/feather52832/nrf52_hal_conf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NRF52_HAL_CONF_H__
-#define NRF52_HAL_CONF_H__
-
-#define HAL_UART_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIME_MODULE_ENABLED
-#define HAL_PWM_MODULE_ENABLED
-#define HAL_RTC_MODULE_ENABLED
-#define HAL_TIMER_MODULE_ENABLED
-#define HAL_TWI_MODULE_ENABLED
-#define HAL_ADCE_MODULE_ENABLED
-#define HAL_TEMP_MODULE_ENABLED
-#define HAL_RNG_MODULE_ENABLED
-// #define HAL_UARTE_MODULE_ENABLED
-// #define HAL_SPIE_MODULE_ENABLED
-// #define HAL_TWIE_MODULE_ENABLED
-
-#endif // NRF52_HAL_CONF_H__
diff --git a/ports/nrf/boards/feather52840/nrf52_hal_conf.h b/ports/nrf/boards/feather52840/nrf52_hal_conf.h
deleted file mode 100644
index fd6073a18..000000000
--- a/ports/nrf/boards/feather52840/nrf52_hal_conf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NRF52_HAL_CONF_H__
-#define NRF52_HAL_CONF_H__
-
-#define HAL_UART_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIME_MODULE_ENABLED
-#define HAL_PWM_MODULE_ENABLED
-#define HAL_RTC_MODULE_ENABLED
-#define HAL_TIMER_MODULE_ENABLED
-#define HAL_TWI_MODULE_ENABLED
-#define HAL_ADCE_MODULE_ENABLED
-#define HAL_TEMP_MODULE_ENABLED
-#define HAL_RNG_MODULE_ENABLED
-// #define HAL_UARTE_MODULE_ENABLED
-// #define HAL_SPIE_MODULE_ENABLED
-// #define HAL_TWIE_MODULE_ENABLED
-
-#endif // NRF52_HAL_CONF_H__
diff --git a/ports/nrf/boards/pca10040/nrf52_hal_conf.h b/ports/nrf/boards/pca10040/nrf52_hal_conf.h
deleted file mode 100644
index fd6073a18..000000000
--- a/ports/nrf/boards/pca10040/nrf52_hal_conf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NRF52_HAL_CONF_H__
-#define NRF52_HAL_CONF_H__
-
-#define HAL_UART_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIME_MODULE_ENABLED
-#define HAL_PWM_MODULE_ENABLED
-#define HAL_RTC_MODULE_ENABLED
-#define HAL_TIMER_MODULE_ENABLED
-#define HAL_TWI_MODULE_ENABLED
-#define HAL_ADCE_MODULE_ENABLED
-#define HAL_TEMP_MODULE_ENABLED
-#define HAL_RNG_MODULE_ENABLED
-// #define HAL_UARTE_MODULE_ENABLED
-// #define HAL_SPIE_MODULE_ENABLED
-// #define HAL_TWIE_MODULE_ENABLED
-
-#endif // NRF52_HAL_CONF_H__
diff --git a/ports/nrf/boards/pca10056/nrf52_hal_conf.h b/ports/nrf/boards/pca10056/nrf52_hal_conf.h
deleted file mode 100644
index fd6073a18..000000000
--- a/ports/nrf/boards/pca10056/nrf52_hal_conf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef NRF52_HAL_CONF_H__
-#define NRF52_HAL_CONF_H__
-
-#define HAL_UART_MODULE_ENABLED
-#define HAL_SPI_MODULE_ENABLED
-#define HAL_TIME_MODULE_ENABLED
-#define HAL_PWM_MODULE_ENABLED
-#define HAL_RTC_MODULE_ENABLED
-#define HAL_TIMER_MODULE_ENABLED
-#define HAL_TWI_MODULE_ENABLED
-#define HAL_ADCE_MODULE_ENABLED
-#define HAL_TEMP_MODULE_ENABLED
-#define HAL_RNG_MODULE_ENABLED
-// #define HAL_UARTE_MODULE_ENABLED
-// #define HAL_SPIE_MODULE_ENABLED
-// #define HAL_TWIE_MODULE_ENABLED
-
-#endif // NRF52_HAL_CONF_H__
diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c
index 043f66852..a2f452b35 100644
--- a/ports/nrf/common-hal/analogio/AnalogIn.c
+++ b/ports/nrf/common-hal/analogio/AnalogIn.c
@@ -37,7 +37,7 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const
     if (pin->adc_channel == 0)
         mp_raise_ValueError("Pin does not have ADC capabilities");
 
-    hal_gpio_cfg_pin(pin->port, pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);
+    nrf_gpio_cfg_default(NRF_GPIO_PIN_MAP(pin->port, pin->pin));
 
     self->pin = pin;
 }
diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nrf/common-hal/digitalio/DigitalInOut.c
index 66fd0eb03..b84877703 100644
--- a/ports/nrf/common-hal/digitalio/DigitalInOut.c
+++ b/ports/nrf/common-hal/digitalio/DigitalInOut.c
@@ -24,146 +24,148 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-
+#include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/runtime.h"
-#include "py/mphal.h"
 
-#include "hal/hal_gpio.h"
-
-#include "common-hal/microcontroller/Pin.h"
-#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "nrf_gpio.h"
 
 digitalinout_result_t common_hal_digitalio_digitalinout_construct(
-        digitalio_digitalinout_obj_t* self, const mcu_pin_obj_t* pin) {
+        digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) {
     self->pin = pin;
-    hal_gpio_cfg_pin(pin->port, pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);
+
+    nrf_gpio_cfg_input(NRF_GPIO_PIN_MAP(pin->port, pin->pin), NRF_GPIO_PIN_NOPULL);
+
     return DIGITALINOUT_OK;
 }
 
-bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t* self) {
+bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *self) {
     return self->pin == mp_const_none;
 }
 
-void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t* self) {
+void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self) {
     if (common_hal_digitalio_digitalinout_deinited(self)) {
         return;
     }
-    reset_pin(self->pin->pin);
+
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+    nrf_gpio_cfg_default(pin);
+
     self->pin = mp_const_none;
 }
 
 void common_hal_digitalio_digitalinout_switch_to_input(
-        digitalio_digitalinout_obj_t* self, digitalio_pull_t pull) {
-    self->output = false;
+        digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+
+    nrf_gpio_cfg_input(pin, NRF_GPIO_PIN_NOPULL);
 
-    hal_gpio_cfg_pin(self->pin->port, self->pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);
     common_hal_digitalio_digitalinout_set_pull(self, pull);
 }
 
 void common_hal_digitalio_digitalinout_switch_to_output(
-        digitalio_digitalinout_obj_t* self, bool value,
+        digitalio_digitalinout_obj_t *self, bool value,
         digitalio_drive_mode_t drive_mode) {
-    const uint8_t pin = self->pin->pin;
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
 
-    self->output = true;
     self->open_drain = (drive_mode == DRIVE_MODE_OPEN_DRAIN);
 
-    hal_gpio_cfg_pin(self->pin->port, pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED);
+    nrf_gpio_cfg_input(pin, NRF_GPIO_PIN_NOPULL);
+
     common_hal_digitalio_digitalinout_set_value(self, value);
 }
 
 digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
-        digitalio_digitalinout_obj_t* self) {
-    return self->output? DIRECTION_OUTPUT : DIRECTION_INPUT;
+        digitalio_digitalinout_obj_t *self) {
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+
+    return (nrf_gpio_pin_dir_get(pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? DIRECTION_OUTPUT : DIRECTION_INPUT;
 }
 
 void common_hal_digitalio_digitalinout_set_value(
-        digitalio_digitalinout_obj_t* self, bool value) {
-    if (value) {
-        if (self->open_drain) {
-            hal_gpio_dir_set(self->pin->port, self->pin->pin, HAL_GPIO_MODE_INPUT);
-        } else {
-            hal_gpio_pin_set(self->pin->port, self->pin->pin);
-            hal_gpio_dir_set(self->pin->port, self->pin->pin, HAL_GPIO_MODE_OUTPUT);
-        }
+        digitalio_digitalinout_obj_t *self, bool value) {
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+
+    if (value && self->open_drain) {
+        nrf_gpio_pin_dir_set(pin, NRF_GPIO_PIN_DIR_INPUT);
     } else {
-        hal_gpio_pin_clear(self->pin->port, self->pin->pin);
-        hal_gpio_dir_set(self->pin->port, self->pin->pin, HAL_GPIO_MODE_OUTPUT);
+        nrf_gpio_pin_dir_set(pin, NRF_GPIO_PIN_DIR_OUTPUT);
+        nrf_gpio_pin_write(pin, value);
     }
 }
 
 bool common_hal_digitalio_digitalinout_get_value(
-        digitalio_digitalinout_obj_t* self) {
-    const uint8_t pin = self->pin->pin;
-    if (!self->output) {
-        return hal_gpio_pin_read(self->pin);
-    } else {
-        if (self->open_drain && hal_gpio_dir_get(self->pin->port, self->pin->pin) == HAL_GPIO_MODE_INPUT) {
+        digitalio_digitalinout_obj_t *self) {
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+    const nrf_gpio_pin_dir_t dir = nrf_gpio_pin_dir_get(pin);
+
+    if (dir == NRF_GPIO_PIN_DIR_INPUT) {
+        if (self->open_drain)
             return true;
-        } else {
-            return (GPIO_BASE(self->pin->port)->OUT >> pin) & 1;
-        }
+
+        return nrf_gpio_pin_read(pin);
     }
+
+    return nrf_gpio_pin_out_read(pin);
 }
 
 void common_hal_digitalio_digitalinout_set_drive_mode(
-        digitalio_digitalinout_obj_t* self,
+        digitalio_digitalinout_obj_t *self,
         digitalio_drive_mode_t drive_mode) {
-    bool value = common_hal_digitalio_digitalinout_get_value(self);
+    const bool value = common_hal_digitalio_digitalinout_get_value(self);
     self->open_drain = drive_mode == DRIVE_MODE_OPEN_DRAIN;
+
     // True is implemented differently between modes so reset the value to make
     // sure its correct for the new mode.
-    if (value) {
+    if (value)
         common_hal_digitalio_digitalinout_set_value(self, value);
-    }
 }
 
 digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
-        digitalio_digitalinout_obj_t* self) {
-    if (self->open_drain) {
+        digitalio_digitalinout_obj_t *self) {
+    if (self->open_drain)
         return DRIVE_MODE_OPEN_DRAIN;
-    } else {
-        return DRIVE_MODE_PUSH_PULL;
-    }
+
+    return DRIVE_MODE_PUSH_PULL;
 }
 
 void common_hal_digitalio_digitalinout_set_pull(
-        digitalio_digitalinout_obj_t* self, digitalio_pull_t pull) {
-    hal_gpio_pull_t asf_pull = HAL_GPIO_PULL_DISABLED;
+        digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+    const uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+    nrf_gpio_pin_pull_t hal_pull = NRF_GPIO_PIN_NOPULL;
+
     switch (pull) {
         case PULL_UP:
-            asf_pull = HAL_GPIO_PULL_UP;
+            hal_pull = NRF_GPIO_PIN_PULLUP;
             break;
         case PULL_DOWN:
-            asf_pull = HAL_GPIO_PULL_DOWN;
+            hal_pull = NRF_GPIO_PIN_PULLDOWN;
             break;
         case PULL_NONE:
         default:
             break;
     }
-    hal_gpio_pull_set(self->pin->port, self->pin->pin, asf_pull);
+
+    nrf_gpio_cfg_input(pin, hal_pull);
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
-        digitalio_digitalinout_obj_t* self) {
-    uint32_t pin = self->pin->pin;
-    if (self->output) {
+        digitalio_digitalinout_obj_t *self) {
+    uint32_t pin = NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin);
+    NRF_GPIO_Type *reg = nrf_gpio_pin_port_decode(&pin);
+
+    if (nrf_gpio_pin_dir_get(pin) == NRF_GPIO_PIN_DIR_OUTPUT) {
         mp_raise_AttributeError("Cannot get pull while in output mode");
         return PULL_NONE;
-    } else {
-        hal_gpio_pull_t pull = hal_gpio_pull_get(self->pin->port, pin);
+    }
 
-        switch(pull)
-        {
-          case HAL_GPIO_PULL_UP:
-          return PULL_UP;
+    switch (reg->PIN_CNF[self->pin->pin] & GPIO_PIN_CNF_PULL_Msk) {
+        case NRF_GPIO_PIN_PULLUP:
+            return PULL_UP;
 
-          case HAL_GPIO_PULL_DOWN:
-          return PULL_DOWN;
+        case NRF_GPIO_PIN_PULLDOWN:
+            return PULL_DOWN;
 
-          default: return PULL_NONE;
-        }
+        default:
+            return PULL_NONE;
     }
 }
diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.h b/ports/nrf/common-hal/digitalio/DigitalInOut.h
index 8089d8bac..ee59eb498 100644
--- a/ports/nrf/common-hal/digitalio/DigitalInOut.h
+++ b/ports/nrf/common-hal/digitalio/DigitalInOut.h
@@ -28,12 +28,10 @@
 #define MICROPY_INCLUDED_NRF_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
-#include "py/obj.h"
 
 typedef struct {
     mp_obj_base_t base;
-    const mcu_pin_obj_t * pin;
-    bool output;
+    const mcu_pin_obj_t *pin;
     bool open_drain;
 } digitalio_digitalinout_obj_t;
 
diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nrf/common-hal/microcontroller/Pin.c
index ee07ff09a..837e813ac 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.c
+++ b/ports/nrf/common-hal/microcontroller/Pin.c
@@ -25,51 +25,15 @@
  */
 
 #include "common-hal/microcontroller/Pin.h"
-#include "shared-bindings/microcontroller/Pin.h"
-
+#include "nrf_gpio.h"
 #include "py/mphal.h"
 
-#if 0
-
-extern volatile bool adc_in_use;
-
-bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
-    if (pin == &pin_TOUT) {
-        return !adc_in_use;
-    }
-    if (pin->gpio_number == NO_GPIO || pin->gpio_number == SPECIAL_CASE) {
-        return false;
-    }
-    return (READ_PERI_REG(pin->peripheral) &
-                (PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 &&
-             (GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 &&
-             (READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0;
-}
-
-void reset_pins(void) {
-    for (int i = 0; i < 17; i++) {
-        // 5 is RXD, 6 is TXD
-        if ((i > 4 && i < 13) || i == 12) {
-            continue;
-        }
-        uint32_t peripheral = PERIPHS_IO_MUX + i * 4;
-        PIN_FUNC_SELECT(peripheral, 0);
-        PIN_PULLUP_DIS(peripheral);
-        // Disable the pin.
-        gpio_output_set(0x0, 0x0, 0x0, 1 << i);
-    }
-}
-#endif
-
-bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
-  return true;
+bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
+    return true;
 }
 
 void reset_all_pins(void) {
+    for (uint32_t pin = 0; pin < NUMBER_OF_PINS; ++pin)
+        nrf_gpio_cfg_default(pin);
 }
 
-void reset_pin(uint8_t pin) {
-
-}
-
-
diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h
index b04151184..66cd011da 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.h
+++ b/ports/nrf/common-hal/microcontroller/Pin.h
@@ -32,6 +32,5 @@
 
 #define mcu_pin_obj_t pin_obj_t
 void reset_all_pins(void);
-void reset_pin(uint8_t pin);
 
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/nrf/common-hal/pulseio/PWMOut.c b/ports/nrf/common-hal/pulseio/PWMOut.c
index ea9ba3f0e..d23662948 100644
--- a/ports/nrf/common-hal/pulseio/PWMOut.c
+++ b/ports/nrf/common-hal/pulseio/PWMOut.c
@@ -30,6 +30,7 @@
 
 #include "py/runtime.h"
 #include "common-hal/pulseio/PWMOut.h"
+#include "nrf_gpio.h"
 #include "shared-bindings/pulseio/PWMOut.h"
 
 #define PWM_MAX_MODULE    3
@@ -161,7 +162,7 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
 
   if (self->pwm)
   {
-    hal_gpio_cfg_pin(pin->port, pin->pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED);
+    nrf_gpio_cfg_output(NRF_GPIO_PIN_MAP(pin->port, pin->pin));
 
     // disable before mapping pin channel
     self->pwm->ENABLE = 0;
@@ -201,7 +202,7 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
     }
   }
 
-  hal_gpio_cfg_pin(self->pin->port, self->pin->pin, HAL_GPIO_MODE_INPUT, HAL_GPIO_PULL_DISABLED);
+  nrf_gpio_cfg_default(NRF_GPIO_PIN_MAP(self->pin->port, self->pin->pin));
 
   self->pwm = NULL;
   self->pin = mp_const_none;
diff --git a/ports/nrf/common-hal/time/__init__.c b/ports/nrf/common-hal/time/__init__.c
index 5e5e9fdf1..e3cb481ef 100644
--- a/ports/nrf/common-hal/time/__init__.c
+++ b/ports/nrf/common-hal/time/__init__.c
@@ -26,15 +26,12 @@
 
 #include "py/mphal.h"
 
-#include "shared-bindings/time/__init__.h"
 #include "tick.h"
 
-#include "nrfx_glue.h"
-
-inline uint64_t common_hal_time_monotonic(void) {
+uint64_t common_hal_time_monotonic(void) {
     return ticks_ms;
 }
 
 void common_hal_time_delay_ms(uint32_t delay) {
-    NRFX_DELAY_US(delay);
+    mp_hal_delay_ms(delay);
 }
diff --git a/ports/nrf/drivers/softpwm.c b/ports/nrf/drivers/softpwm.c
deleted file mode 100644
index 22564f7d0..000000000
--- a/ports/nrf/drivers/softpwm.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Mark Shannon
- *
- * 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 "py/mphal.h"
-
-#if MICROPY_PY_MACHINE_SOFT_PWM
-
-#include "stddef.h"
-#include "py/runtime.h"
-#include "py/gc.h"
-#include "hal_timer.h"
-#include "hal_gpio.h"
-#include "pin.h"
-
-#include "ticker.h"
-
-#define CYCLES_PER_MICROSECONDS 16
-
-#define MICROSECONDS_PER_TICK 16
-#define CYCLES_PER_TICK (CYCLES_PER_MICROSECONDS*MICROSECONDS_PER_TICK)
-// This must be an integer multiple of MICROSECONDS_PER_TICK
-#define MICROSECONDS_PER_MACRO_TICK 6000
-#define MILLISECONDS_PER_MACRO_TICK 6
-
-#define PWM_TICKER_INDEX 2
-
-// Default period of 20ms
-#define DEFAULT_PERIOD ((20*1000)/MICROSECONDS_PER_TICK)
-
-typedef struct _pwm_event {
-    uint16_t time;
-    uint8_t pin;
-    uint8_t turn_on;
-} pwm_event;
-
-typedef struct _pwm_events {
-    uint8_t count;
-    uint16_t period;
-    uint32_t all_pins;
-    pwm_event events[1];
-} pwm_events;
-
-static const pwm_events OFF_EVENTS = {
-    .count = 1,
-    .period = DEFAULT_PERIOD,
-    .all_pins = 0,
-    .events = {
-        {
-            .time = 1024,
-            .pin = 31,
-            .turn_on = 0
-        }
-    }
-};
-
-#define active_events MP_STATE_PORT(pwm_active_events)
-#define pending_events MP_STATE_PORT(pwm_pending_events)
-
-void softpwm_init(void) {
-    active_events = &OFF_EVENTS;
-    pending_events = NULL;
-}
-
-static uint8_t next_event = 0;
-
-static inline int32_t pwm_get_period_ticks(void) {
-    const pwm_events *tmp = pending_events;
-    if (tmp == NULL)
-        tmp = active_events;
-    return tmp->period;
-}
-
-#if 0
-void pwm_dump_events(const pwm_events *events) {
-    printf("Count %d, period %d, all pins %d\r\n", events->count, events->period, events->all_pins);
-    for (uint32_t i = 0; i < events->count; i++) {
-        const pwm_event *event = &events->events[i];
-        printf("Event. pin: %d, duty cycle: %d, turn_on: %d\r\n",
-               event->pin, event->time, event->turn_on);
-    }
-}
-
-void pwm_dump_state(void) {
-    while(pending_events);
-    pwm_dump_events(active_events);
-}
-#endif
-
-static const pwm_events *swap_pending(const pwm_events *in) {
-    __disable_irq();
-    const pwm_events *result = pending_events;
-    pending_events = in;
-    __enable_irq();
-    return result;
-}
-
-static pwm_events *copy_events(const pwm_events *orig, uint32_t count) {
-    pwm_events *events = m_malloc(sizeof(pwm_events) + (count-1)*sizeof(pwm_event));
-    events->count = count;
-    uint32_t copy = count > orig->count ? orig->count : count;
-    for (uint32_t i = 0; i < copy; i++) {
-        events->events[i] = orig->events[i];
-    }
-    return events;
-}
-
-static int find_pin_in_events(const pwm_events *events, uint32_t pin) {
-    for (int i = 0; i < events->count; i++) {
-        if (events->events[i].pin == pin)
-            return i;
-    }
-    return -1;
-}
-
-static void sort_events(pwm_events *events) {
-    // Insertion sort
-    for (int32_t i = 1; i < events->count; i++) {
-        pwm_event x = events->events[i];
-        int32_t j;
-        for (j = i - 1; j >= 0 && events->events[j].time > x.time; j--) {
-            events->events[j+1] = events->events[j];
-        }
-        events->events[j+1] = x;
-    }
-}
-
-int32_t pwm_callback(void) {
-    int32_t tdiff;
-    const pwm_events *events = active_events;
-    const pwm_event *event = &events->events[next_event];
-    int32_t tnow = (event->time*events->period)>>10;
-    do {
-        if (event->turn_on) {
-            hal_gpio_pin_set(0, event->pin);
-            next_event++;
-        } else {
-            hal_gpio_out_clear(0, events->all_pins);
-            next_event = 0;
-            tnow = 0;
-            if (pending_events) {
-                events = pending_events;
-                active_events = events;
-                pending_events = NULL;
-            }
-        }
-        event = &events->events[next_event];
-        tdiff = ((event->time*events->period)>>10) - tnow;
-    } while (tdiff == 0);
-    return tdiff;
-}
-
-void pwm_start(void) {
-    set_ticker_callback(PWM_TICKER_INDEX, pwm_callback, 120);
-}
-
-void pwm_stop(void) {
-    clear_ticker_callback(PWM_TICKER_INDEX);
-}
-
-static void pwm_set_period_ticks(int32_t ticks) {
-    const pwm_events *old_events = swap_pending(NULL);
-    if (old_events == NULL) {
-        old_events = active_events;
-    }
-    pwm_events *events = copy_events(old_events, old_events->count);
-    events->all_pins = old_events->all_pins;
-    events->period = ticks;
-    pending_events = events;
-}
-
-int pwm_set_period_us(int32_t us) {
-    if ((us < 256) ||
-        (us > 1000000)) {
-        return -1;
-    }
-    pwm_set_period_ticks(us/MICROSECONDS_PER_TICK);
-    return 0;
-}
-
-int32_t pwm_get_period_us(void) {
-    return pwm_get_period_ticks()*MICROSECONDS_PER_TICK;
-}
-
-void pwm_set_duty_cycle(int32_t pin, uint32_t value) {
-    if (value >= (1<<10)) {
-        value = (1<<10)-1;
-    }
-    uint32_t turn_on_time = 1024-value;
-    const pwm_events *old_events = swap_pending(NULL);
-    if (old_events == NULL) {
-        old_events = active_events;
-    }
-    if (((1<<pin)&old_events->all_pins) == 0) {
-        hal_gpio_cfg_pin(0, pin, HAL_GPIO_MODE_OUTPUT, HAL_GPIO_PULL_DISABLED);
-    }
-    int ev = find_pin_in_events(old_events, pin);
-    pwm_events *events;
-    if (ev < 0 && value == 0) {
-        return;
-    } else if (ev < 0) {
-        events = copy_events(old_events, old_events->count+1);
-        events->all_pins = old_events->all_pins | (1<<pin);
-        events->events[old_events->count].time = turn_on_time;
-        events->events[old_events->count].pin = pin;
-        events->events[old_events->count].turn_on = 1;
-    } else if (value == 0) {
-        events = copy_events(old_events, old_events->count-1);
-        events->all_pins = old_events->all_pins & ~(1<<pin);
-        if (ev < old_events->count-1) {
-            events->events[ev] = old_events->events[old_events->count-1];
-        }
-    } else {
-        events = copy_events(old_events, old_events->count);
-        events->all_pins = old_events->all_pins;
-        events->events[ev].time = turn_on_time;
-    }
-    events->period = old_events->period;
-    sort_events(events);
-    pending_events = events;
-    return;
-}
-
-void pwm_release(int32_t pin) {
-    pwm_set_duty_cycle(pin, 0);
-    const pwm_events *ev = active_events;
-    int i = find_pin_in_events(ev, pin);
-    if (i < 0)
-        return;
-    // If i >= 0 it means that `ev` is in RAM, so it safe to discard the const qualifier
-    ((pwm_events *)ev)->events[i].pin = 31;
-    hal_gpio_pin_clear(0, pin);
-}
-
-#endif // MICROPY_PY_MACHINE_SOFT_PWM
diff --git a/ports/nrf/drivers/softpwm.h b/ports/nrf/drivers/softpwm.h
deleted file mode 100644
index a73c15cd8..000000000
--- a/ports/nrf/drivers/softpwm.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MICROPY_INCLUDED_LIB_PWM_H__
-#define __MICROPY_INCLUDED_LIB_PWM_H__
-
-void softpwm_init(void);
-void pwm_start(void);
-void pwm_stop(void);
-
-int pwm_set_period_us(int32_t us);
-int32_t pwm_get_period_us(void);
-void pwm_set_duty_cycle(int32_t pin, int32_t value);
-void pwm_release(int32_t pin);
-
-#endif // __MICROPY_INCLUDED_LIB_PWM_H__
diff --git a/ports/nrf/drivers/ticker.c b/ports/nrf/drivers/ticker.c
deleted file mode 100644
index aa730d643..000000000
--- a/ports/nrf/drivers/ticker.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Mark Shannon
- *
- * 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 "py/mphal.h"
-
-#if MICROPY_PY_MACHINE_SOFT_PWM
-
-#include "ticker.h"
-#include "hal_irq.h"
-
-#define FastTicker NRF_TIMER1
-#define FastTicker_IRQn TIMER1_IRQn
-#define FastTicker_IRQHandler TIMER1_IRQHandler
-
-#define SlowTicker_IRQn SWI0_IRQn
-#define SlowTicker_IRQHandler SWI0_IRQHandler
-
-// Ticker callback function called every MACRO_TICK
-static volatile callback_ptr slow_ticker;
-
-void ticker_init(callback_ptr slow_ticker_callback) {
-    slow_ticker = slow_ticker_callback;
-
-    NRF_TIMER_Type *ticker = FastTicker;
-#ifdef NRF51
-    ticker->POWER = 1;
-#endif
-    __NOP();
-    ticker_stop();
-    ticker->TASKS_CLEAR = 1;
-    ticker->CC[3] = MICROSECONDS_PER_MACRO_TICK;
-    ticker->MODE = TIMER_MODE_MODE_Timer;
-    ticker->BITMODE = TIMER_BITMODE_BITMODE_24Bit << TIMER_BITMODE_BITMODE_Pos;
-    ticker->PRESCALER = 4; // 1 tick == 1 microsecond
-    ticker->INTENSET = TIMER_INTENSET_COMPARE3_Msk;
-    ticker->SHORTS = 0;
-
-#ifdef NRF51
-    hal_irq_priority(FastTicker_IRQn, 1);
-#else
-    hal_irq_priority(FastTicker_IRQn, 2);
-#endif
-
-    hal_irq_priority(SlowTicker_IRQn, 3);
-    hal_irq_priority(SlowTicker_IRQn, 3);
-
-    hal_irq_enable(SlowTicker_IRQn);
-}
-
-/* Start and stop timer 1 including workarounds for Anomaly 73 for Timer
-* http://www.nordicsemi.com/eng/content/download/29490/494569/file/nRF51822-PAN%20v3.0.pdf
-*/
-void ticker_start(void) {
-    hal_irq_enable(FastTicker_IRQn);
-#ifdef NRF51
-    *(uint32_t *)0x40009C0C = 1; // for Timer 1
-#endif
-    FastTicker->TASKS_START = 1;
-}
-
-void ticker_stop(void) {
-    hal_irq_disable(FastTicker_IRQn);
-    FastTicker->TASKS_STOP = 1;
-#ifdef NRF51
-    *(uint32_t *)0x40009C0C = 0; // for Timer 1
-#endif
-}
-
-int32_t noop(void) {
-    return -1;
-}
-
-volatile uint32_t ticks;
-
-static ticker_callback_ptr callbacks[3] = { noop, noop, noop };
-
-void FastTicker_IRQHandler(void) {
-    NRF_TIMER_Type *ticker = FastTicker;
-    ticker_callback_ptr *call = callbacks;
-    if (ticker->EVENTS_COMPARE[0]) {
-        ticker->EVENTS_COMPARE[0] = 0;
-        ticker->CC[0] += call[0]()*MICROSECONDS_PER_TICK;
-    }
-    if (ticker->EVENTS_COMPARE[1]) {
-        ticker->EVENTS_COMPARE[1] = 0;
-        ticker->CC[1] += call[1]()*MICROSECONDS_PER_TICK;
-    }
-    if (ticker->EVENTS_COMPARE[2]) {
-        ticker->EVENTS_COMPARE[2] = 0;
-        ticker->CC[2] += call[2]()*MICROSECONDS_PER_TICK;
-    }
-    if (ticker->EVENTS_COMPARE[3]) {
-        ticker->EVENTS_COMPARE[3] = 0;
-        ticker->CC[3] += MICROSECONDS_PER_MACRO_TICK;
-        ticks += MILLISECONDS_PER_MACRO_TICK;
-        hal_irq_pending(SlowTicker_IRQn);
-    }
-}
-
-
-static const uint32_t masks[3] = {
-    TIMER_INTENCLR_COMPARE0_Msk,
-    TIMER_INTENCLR_COMPARE1_Msk,
-    TIMER_INTENCLR_COMPARE2_Msk,
-};
-
-int set_ticker_callback(uint32_t index, ticker_callback_ptr func, int32_t initial_delay_us) {
-    if (index > 3)
-        return -1;
-    NRF_TIMER_Type *ticker = FastTicker;
-    callbacks[index] = noop;
-    ticker->INTENCLR = masks[index];
-    ticker->TASKS_CAPTURE[index] = 1;
-    uint32_t t = FastTicker->CC[index];
-    // Need to make sure that set tick is aligned to lastest tick
-    // Use CC[3] as a reference, as that is always up-to-date.
-    int32_t cc3 = FastTicker->CC[3];
-    int32_t delta = t+initial_delay_us-cc3;
-    delta = (delta/MICROSECONDS_PER_TICK+1)*MICROSECONDS_PER_TICK;
-    callbacks[index] = func;
-    ticker->INTENSET = masks[index];
-    FastTicker->CC[index] = cc3 + delta;
-    return 0;
-}
-
-int clear_ticker_callback(uint32_t index) {
-    if (index > 3)
-        return -1;
-    FastTicker->INTENCLR = masks[index];
-    callbacks[index] = noop;
-    return 0;
-}
-
-void SlowTicker_IRQHandler(void)
-{
-    slow_ticker();
-}
-
-#endif // MICROPY_PY_MACHINE_SOFT_PWM
diff --git a/ports/nrf/drivers/ticker.h b/ports/nrf/drivers/ticker.h
deleted file mode 100644
index 6ac87cd50..000000000
--- a/ports/nrf/drivers/ticker.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __MICROPY_INCLUDED_LIB_TICKER_H__
-#define __MICROPY_INCLUDED_LIB_TICKER_H__
-
-/*************************************
- * 62.5kHz (16µs cycle time) ticker.
- ************************************/
-
-#include "nrf.h"
-
-typedef void (*callback_ptr)(void);
-typedef int32_t (*ticker_callback_ptr)(void);
-
-void ticker_init(callback_ptr slow_ticker_callback);
-void ticker_start(void);
-void ticker_stop(void);
-
-int clear_ticker_callback(uint32_t index);
-int set_ticker_callback(uint32_t index, ticker_callback_ptr func, int32_t initial_delay_us);
-
-int set_low_priority_callback(callback_ptr callback, int id);
-
-#define CYCLES_PER_MICROSECONDS 16
-
-#define MICROSECONDS_PER_TICK 16
-#define CYCLES_PER_TICK (CYCLES_PER_MICROSECONDS*MICROSECONDS_PER_TICK)
-// This must be an integer multiple of MICROSECONDS_PER_TICK
-#define MICROSECONDS_PER_MACRO_TICK 6000
-#define MILLISECONDS_PER_MACRO_TICK 6
-
-#endif // __MICROPY_INCLUDED_LIB_TICKER_H__
\ No newline at end of file
diff --git a/ports/nrf/fifo.c b/ports/nrf/fifo.c
deleted file mode 100644
index 7e8f989c3..000000000
--- a/ports/nrf/fifo.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/******************************************************************************/
-/*!
-    @file     fifo.c
-    @author   hathach (tinyusb.org)
-
-    @section DESCRIPTION
-
-    Light-weight FIFO buffer with basic mutex support
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2012, K. Townsend (microBuilder.eu)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/******************************************************************************/
-
-#include "fifo.h"
-
-/*------------------------------------------------------------------*/
-/*
- *------------------------------------------------------------------*/
-#if CFG_FIFO_MUTEX
-
-#define mutex_lock_if_needed(_ff)     if (_ff->mutex) fifo_mutex_lock(_ff->mutex)
-#define mutex_unlock_if_needed(_ff)   if (_ff->mutex) fifo_mutex_unlock(_ff->mutex)
-
-#else
-
-#define mutex_lock_if_needed(_ff)
-#define mutex_unlock_if_needed(_ff)
-
-#endif
-
-static inline uint16_t min16_of(uint16_t x, uint16_t y)
-{
-  return (x < y) ? x : y;
-}
-
-static inline bool fifo_initalized(fifo_t* f)
-{
-  return (f->buffer != NULL) && (f->depth > 0) && (f->item_size > 0);
-}
-
-
-/******************************************************************************/
-/*!
-    @brief Read one byte out of the RX buffer.
-
-    This function will return the byte located at the array index of the
-    read pointer, and then increment the read pointer index.  If the read
-    pointer exceeds the maximum buffer size, it will roll over to zero.
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-    @param[in]  p_buffer
-                Pointer to the place holder for data read from the buffer
-
-    @returns TRUE if the queue is not empty
-*/
-/******************************************************************************/
-bool fifo_read(fifo_t* f, void * p_buffer)
-{
-  if( !fifo_initalized(f) ) return false;
-  if( fifo_empty(f) ) return false;
-
-  mutex_lock_if_needed(f);
-
-  memcpy(p_buffer,
-         f->buffer + (f->rd_idx * f->item_size),
-         f->item_size);
-  f->rd_idx = (f->rd_idx + 1) % f->depth;
-  f->count--;
-
-  mutex_unlock_if_needed(f);
-
-  return true;
-}
-
-/******************************************************************************/
-/*!
-    @brief This function will read n elements into the array index specified by
-    the write pointer and increment the write index. If the write index
-    exceeds the max buffer size, then it will roll over to zero.
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-    @param[in]  p_data
-                The pointer to data location
-    @param[in]  count
-                Number of element that buffer can afford
-
-    @returns number of bytes read from the FIFO
-*/
-/******************************************************************************/
-uint16_t fifo_read_n (fifo_t* f, void * p_buffer, uint16_t count)
-{
-  if( !fifo_initalized(f) ) return false;
-  if( fifo_empty(f) ) return false;
-
-  /* Limit up to fifo's count */
-  count = min16_of(count, f->count);
-  if( count == 0 ) return 0;
-
-  mutex_lock_if_needed(f);
-
-  /* Could copy up to 2 portions marked as 'x' if queue is wrapped around
-   * case 1: ....RxxxxW.......
-   * case 2: xxxxxW....Rxxxxxx
-   */
-//  uint16_t index2upper = min16_of(count, f->count-f->rd_idx);
-
-  uint8_t* p_buf = (uint8_t*) p_buffer;
-  uint16_t len = 0;
-  while( (len < count) && fifo_read(f, p_buf) )
-  {
-    len++;
-    p_buf += f->item_size;
-  }
-
-  mutex_unlock_if_needed(f);
-
-  return len;
-}
-
-/******************************************************************************/
-/*!
-    @brief Reads one item without removing it from the FIFO
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-    @param[in]  position
-                Position to read from in the FIFO buffer
-    @param[in]  p_buffer
-                Pointer to the place holder for data read from the buffer
-
-    @returns TRUE if the queue is not empty
-*/
-/******************************************************************************/
-bool fifo_peek_at(fifo_t* f, uint16_t position, void * p_buffer)
-{
-  if ( !fifo_initalized(f) ) return false;
-  if ( position >= f->count ) return false;
-
-  // rd_idx is position=0
-  uint16_t index = (f->rd_idx + position) % f->depth;
-  memcpy(p_buffer,
-         f->buffer + (index * f->item_size),
-         f->item_size);
-
-  return true;
-}
-
-/******************************************************************************/
-/*!
-    @brief Write one element into the RX buffer.
-
-    This function will write one element into the array index specified by
-    the write pointer and increment the write index. If the write index
-    exceeds the max buffer size, then it will roll over to zero.
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-    @param[in]  p_data
-                The byte to add to the FIFO
-
-    @returns TRUE if the data was written to the FIFO (overwrittable
-             FIFO will always return TRUE)
-*/
-/******************************************************************************/
-bool fifo_write(fifo_t* f, void const * p_data)
-{
-  if ( !fifo_initalized(f) ) return false;
-  if ( fifo_full(f) && !f->overwritable ) return false;
-
-  mutex_lock_if_needed(f);
-
-  memcpy( f->buffer + (f->wr_idx * f->item_size),
-          p_data,
-          f->item_size);
-
-  f->wr_idx = (f->wr_idx + 1) % f->depth;
-
-  if (fifo_full(f))
-  {
-    f->rd_idx = f->wr_idx; // keep the full state (rd == wr && len = size)
-  }
-  else
-  {
-    f->count++;
-  }
-
-  mutex_unlock_if_needed(f);
-
-  return true;
-}
-
-/******************************************************************************/
-/*!
-    @brief This function will write n elements into the array index specified by
-    the write pointer and increment the write index. If the write index
-    exceeds the max buffer size, then it will roll over to zero.
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-    @param[in]  p_data
-                The pointer to data to add to the FIFO
-    @param[in]  count
-                Number of element
-    @return Number of written elements
-*/
-/******************************************************************************/
-uint16_t fifo_write_n(fifo_t* f, void const * p_data, uint16_t count)
-{
-  if ( count == 0 ) return 0;
-
-  uint8_t* p_buf = (uint8_t*) p_data;
-
-  uint16_t len = 0;
-  while( (len < count) && fifo_write(f, p_buf) )
-  {
-    len++;
-    p_buf += f->item_size;
-  }
-
-  return len;
-}
-
-/******************************************************************************/
-/*!
-    @brief Clear the fifo read and write pointers and set length to zero
-
-    @param[in]  f
-                Pointer to the FIFO buffer to manipulate
-*/
-/******************************************************************************/
-void fifo_clear(fifo_t *f)
-{
-  mutex_lock_if_needed(f);
-
-  f->rd_idx = f->wr_idx = f->count = 0;
-
-  mutex_unlock_if_needed(f);
-}
diff --git a/ports/nrf/fifo.h b/ports/nrf/fifo.h
deleted file mode 100644
index df54350cf..000000000
--- a/ports/nrf/fifo.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************/
-/*!
-    @file     fifo.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2012, K. Townsend (microBuilder.eu)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/******************************************************************************/
-#ifndef __FIFO_H__
-#define __FIFO_H__
-
-#define CFG_FIFO_MUTEX      1
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if CFG_FIFO_MUTEX
-
-#include "nrf.h"
-
-#define fifo_mutex_t          IRQn_Type
-
-#define fifo_mutex_lock(m)    NVIC_DisableIRQ(m)
-#define fifo_mutex_unlock(m)  NVIC_EnableIRQ(m)
-
-/* Internal use only */
-#define _mutex_declare(m)     .mutex = m
-
-#else
-
-#define _mutex_declare(m)
-
-#endif
-
-typedef struct _fifo_t
-{
-           uint8_t* const buffer    ; ///< buffer pointer
-           uint16_t const depth     ; ///< max items
-           uint16_t const item_size ; ///< size of each item
-  volatile uint16_t count           ; ///< number of items in queue
-  volatile uint16_t wr_idx          ; ///< write pointer
-  volatile uint16_t rd_idx          ; ///< read pointer
-  bool const overwritable;
-
-#if CFG_FIFO_MUTEX
-  fifo_mutex_t const mutex;
-#endif
-
-} fifo_t;
-
-/**
- * Macro to declare a fifo
- * @param name         : name of the fifo
- * @param depth        : max number of items
- * @param type         : data type of item
- * @param overwritable : whether fifo should be overwrite when full
- * @param mutex        : mutex object
- */
-#define FIFO_DEF(_name, _depth, _type, _overwritable, _mutex)\
-  _type _name##_buffer[_depth];\
-  fifo_t _name##_fifo = {\
-      .buffer       = (uint8_t*) _name##_buffer,\
-      .depth        = _depth,\
-      .item_size    = sizeof(_type),\
-      .overwritable = _overwritable,\
-      _mutex_declare(_mutex)\
-  };\
-  fifo_t* _name = &_name##_fifo
-
-
-void     fifo_clear   (fifo_t *f);
-
-bool     fifo_write   (fifo_t* f, void const * p_data);
-uint16_t fifo_write_n (fifo_t* f, void const * p_data, uint16_t count);
-
-bool     fifo_read    (fifo_t* f, void * p_buffer);
-uint16_t fifo_read_n  (fifo_t* f, void * p_buffer, uint16_t count);
-
-bool     fifo_peek_at (fifo_t* f, uint16_t position, void * p_buffer);
-static inline bool fifo_peek(fifo_t* f, void * p_buffer)
-{
-  return fifo_peek_at(f, 0, p_buffer);
-}
-
-
-static inline bool fifo_empty(fifo_t* f)
-{
-  return (f->count == 0);
-}
-
-static inline bool fifo_full(fifo_t* f)
-{
-  return (f->count == f->depth);
-}
-
-static inline uint16_t fifo_count(fifo_t* f)
-{
-  return f->count;
-}
-
-static inline uint16_t fifo_remaining(fifo_t* f)
-{
-  return f->depth - f->count;
-}
-
-static inline uint16_t fifo_depth(fifo_t* f)
-{
-  return f->depth;
-}
-
-
-#ifdef __cplusplus
-}
-#endif 
-
-#endif
diff --git a/ports/nrf/gccollect.h b/ports/nrf/gccollect.h
deleted file mode 100644
index 6a285b017..000000000
--- a/ports/nrf/gccollect.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- * Copyright (c) 2016 Glenn Ruben Bakke
- *
- * 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.
- */
-
-#ifndef GC_COLLECT_H__
-#define GC_COLLECT_H__
-
-extern uint32_t _etext;
-extern uint32_t _sidata;
-extern uint32_t _ram_start;
-extern uint32_t _sdata;
-extern uint32_t _edata;
-extern uint32_t _sbss;
-extern uint32_t _ebss;
-extern uint32_t _heap_start;
-extern uint32_t _heap_end;
-extern uint32_t _estack;
-extern uint32_t _ram_end;
-
-void gc_collect(void);
-
-#endif
diff --git a/ports/nrf/hal/hal_gpio.h b/ports/nrf/hal/hal_gpio.h
deleted file mode 100644
index 2c1fb2774..000000000
--- a/ports/nrf/hal/hal_gpio.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * 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.
- */
-
-#ifndef HAL_GPIO_H__
-#define HAL_GPIO_H__
-
-#include "nrf.h"
-
-#ifdef NRF52832_XXAA
-  #define POINTERS (const uint32_t[]){NRF_P0_BASE}
-#endif
-
-#ifdef NRF52840_XXAA
-  #define POINTERS (const uint32_t[]){NRF_P0_BASE, NRF_P1_BASE}
-#endif
-
-#define GPIO_BASE(x) ((NRF_GPIO_Type *)POINTERS[x])
-
-#define hal_gpio_pin_high(p) (((NRF_GPIO_Type *)(GPIO_BASE((p)->port)))->OUTSET = (1 << (p)->pin) )
-#define hal_gpio_pin_low(p)  (((NRF_GPIO_Type *)(GPIO_BASE((p)->port)))->OUTCLR = (1 << (p)->pin) )
-#define hal_gpio_pin_read(p) (((NRF_GPIO_Type *)(GPIO_BASE((p)->port)))->IN >> ((p)->pin) & 1)
-
-typedef enum {
-    HAL_GPIO_POLARITY_EVENT_LOW_TO_HIGH = GPIOTE_CONFIG_POLARITY_LoToHi << GPIOTE_CONFIG_POLARITY_Pos,
-    HAL_GPIO_POLARITY_EVENT_HIGH_TO_LOW = GPIOTE_CONFIG_POLARITY_HiToLo << GPIOTE_CONFIG_POLARITY_Pos,
-    HAL_GPIO_POLARITY_EVENT_TOGGLE      = GPIOTE_CONFIG_POLARITY_Toggle << GPIOTE_CONFIG_POLARITY_Pos
-} hal_gpio_polarity_event_t;
-
-typedef enum {
-    HAL_GPIO_PULL_DISABLED = (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos),
-    HAL_GPIO_PULL_DOWN     = (GPIO_PIN_CNF_PULL_Pulldown << GPIO_PIN_CNF_PULL_Pos),
-    HAL_GPIO_PULL_UP       = (GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos)
-} hal_gpio_pull_t;
-
-typedef enum {
-    HAL_GPIO_MODE_OUTPUT = (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos),
-    HAL_GPIO_MODE_INPUT  = (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos),
-} hal_gpio_mode_t;
-
-static inline void hal_gpio_cfg_pin(uint8_t port, uint32_t pin_number, hal_gpio_mode_t mode, hal_gpio_pull_t pull) {
-    GPIO_BASE(port)->PIN_CNF[pin_number] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
-                                         | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
-                                         | pull
-                                         | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
-                                         | mode;
-}
-
-static inline void hal_gpio_dir_set(uint8_t port, uint32_t pin, hal_gpio_mode_t mode)
-{
-  GPIO_BASE(port)->PIN_CNF[pin] &= ~GPIO_PIN_CNF_DIR_Msk;
-  GPIO_BASE(port)->PIN_CNF[pin] |= mode;
-}
-
-static inline hal_gpio_mode_t hal_gpio_dir_get(uint8_t port, uint32_t pin)
-{
-  return GPIO_BASE(port)->PIN_CNF[pin] & GPIO_PIN_CNF_DIR_Msk;
-}
-
-static inline void hal_gpio_pull_set(uint8_t port, uint32_t pin, hal_gpio_pull_t pull)
-{
-  GPIO_BASE(port)->PIN_CNF[pin] &= ~GPIO_PIN_CNF_PULL_Msk;
-  GPIO_BASE(port)->PIN_CNF[pin] |= pull;
-}
-
-static inline hal_gpio_pull_t hal_gpio_pull_get(uint8_t port, uint32_t pin)
-{
-  return GPIO_BASE(port)->PIN_CNF[pin] & GPIO_PIN_CNF_PULL_Msk;
-}
-
-static inline void hal_gpio_out_set(uint8_t port, uint32_t pin_mask) {
-    GPIO_BASE(port)->OUTSET = pin_mask;
-}
-
-static inline void hal_gpio_out_clear(uint8_t port, uint32_t pin_mask) {
-    GPIO_BASE(port)->OUTCLR = pin_mask;
-}
-
-static inline void hal_gpio_pin_set(uint8_t port, uint32_t pin) {
-    GPIO_BASE(port)->OUTSET = (1 << pin);
-}
-
-static inline void hal_gpio_pin_clear(uint8_t port, uint32_t pin) {
-    GPIO_BASE(port)->OUTCLR = (1 << pin);
-}
-
-static inline void hal_gpio_pin_set_value(uint8_t port, uint32_t pin, uint8_t value) {
-  if (value) {
-    hal_gpio_pin_set(port, pin);
-  }else {
-    hal_gpio_pin_clear(port, pin);
-  }
-}
-
-static inline void hal_gpio_pin_toggle(uint8_t port, uint32_t pin) {
-    uint32_t pin_mask   = (1 << pin);
-    uint32_t pins_state = NRF_GPIO->OUT;
-
-    GPIO_BASE(port)->OUTSET = (~pins_state) & pin_mask;
-    GPIO_BASE(port)->OUTCLR = pins_state & pin_mask;
-}
-
-typedef enum {
-    HAL_GPIO_EVENT_CHANNEL_0 = 0,
-    HAL_GPIO_EVENT_CHANNEL_1,
-    HAL_GPIO_EVENT_CHANNEL_2,
-    HAL_GPIO_EVENT_CHANNEL_3,
-    HAL_GPIO_EVENT_CHANNEL_4,
-    HAL_GPIO_EVENT_CHANNEL_5,
-    HAL_GPIO_EVENT_CHANNEL_6,
-    HAL_GPIO_EVENT_CHANNEL_7
-} hal_gpio_event_channel_t;
-
-typedef struct {
-    hal_gpio_event_channel_t  channel;
-    hal_gpio_polarity_event_t event;
-    uint32_t                  pin;
-    uint8_t                   port;
-    uint8_t                   init_level;
-} hal_gpio_event_config_t;
-
-typedef void (*hal_gpio_event_callback_t)(hal_gpio_event_channel_t channel);
-
-void hal_gpio_register_callback(hal_gpio_event_callback_t cb);
-
-void hal_gpio_event_config(hal_gpio_event_config_t const * p_config);
-
-#endif // HAL_GPIO_H__
diff --git a/ports/nrf/hal/hal_rng.c b/ports/nrf/hal/hal_rng.c
deleted file mode 100644
index 39b6f5789..000000000
--- a/ports/nrf/hal/hal_rng.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * 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 "mphalport.h"
-#include "hal_rng.h"
-
-#ifdef HAL_RNG_MODULE_ENABLED
-
-#if BLUETOOTH_SD
-#include "py/nlr.h"
-#include "ble_drv.h"
-#include "nrf_soc.h"
-
-#define BLUETOOTH_STACK_ENABLED() (ble_drv_stack_enabled())
-
-#endif // BLUETOOTH_SD
-
-uint32_t hal_rng_generate(void) {
-
-    uint32_t retval = 0;
-
-#if BLUETOOTH_SD
-
-    if (BLUETOOTH_STACK_ENABLED() == 1) {
-        uint32_t status;
-        do {
-            status = sd_rand_application_vector_get((uint8_t *)&retval, 4); // Extract 4 bytes
-        } while (status != 0);
-    } else {
-#endif
-        uint8_t * p_retval = (uint8_t *)&retval;
-
-        NRF_RNG->EVENTS_VALRDY = 0;
-        NRF_RNG->TASKS_START   = 1;
-
-        for (uint16_t i = 0; i < 4; i++) {
-            while (NRF_RNG->EVENTS_VALRDY == 0) {
-                ;
-            }
-            NRF_RNG->EVENTS_VALRDY = 0;
-            p_retval[i] = NRF_RNG->VALUE;
-        }
-
-        NRF_RNG->TASKS_STOP = 1;
-#if BLUETOOTH_SD
-    }
-#endif
-
-    return retval;
-}
-
-#endif // HAL_RNG_MODULE_ENABLED
-
diff --git a/ports/nrf/hal/hal_rng.h b/ports/nrf/hal/hal_rng.h
deleted file mode 100644
index d09a26eb9..000000000
--- a/ports/nrf/hal/hal_rng.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * 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.
- */
-
-#ifndef HAL_RNG_H__
-#define HAL_RNG_H__
-
-#include "nrf.h"
-
-uint32_t hal_rng_generate(void);
-
-#endif // HAL_RNG_H__
diff --git a/ports/nrf/hal/nrf52_hal.h b/ports/nrf/hal/nrf52_hal.h
deleted file mode 100644
index daa05e910..000000000
--- a/ports/nrf/hal/nrf52_hal.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Glenn Ruben Bakke
- *
- * 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 <nrf.h>
-
-// include config from board
-#include "nrf52_hal_conf.h"
diff --git a/ports/nrf/modules/random/modrandom.c b/ports/nrf/modules/random/modrandom.c
deleted file mode 100644
index 0e140750d..000000000
--- a/ports/nrf/modules/random/modrandom.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
- *
- * 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 <assert.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "hal_rng.h"
-
-#if MICROPY_PY_HW_RNG
-
-static inline int rand30() {
-    uint32_t val = hal_rng_generate();
-    return (val & 0x3fffffff); // binary mask b00111111111111111111111111111111
-}
-
-static inline int randbelow(int n) {
-    return rand30() % n;
-}
-
-STATIC mp_obj_t mod_random_getrandbits(mp_obj_t num_in) {
-    int n = mp_obj_get_int(num_in);
-    if (n > 30 || n == 0) {
-        nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-    }
-    uint32_t mask = ~0;
-    // Beware of C undefined behavior when shifting by >= than bit size
-    mask >>= (32 - n);
-    return mp_obj_new_int_from_uint(rand30() & mask);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandbits);
-
-STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) {
-    mp_int_t start = mp_obj_get_int(args[0]);
-    if (n_args == 1) {
-        // range(stop)
-        if (start > 0) {
-            return mp_obj_new_int(randbelow(start));
-        } else {
-            nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-        }
-    } else {
-        mp_int_t stop = mp_obj_get_int(args[1]);
-        if (n_args == 2) {
-            // range(start, stop)
-            if (start < stop) {
-                return mp_obj_new_int(start + randbelow(stop - start));
-            } else {
-                nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-            }
-        } else {
-            // range(start, stop, step)
-            mp_int_t step = mp_obj_get_int(args[2]);
-            mp_int_t n;
-            if (step > 0) {
-                n = (stop - start + step - 1) / step;
-            } else if (step < 0) {
-                n = (stop - start + step + 1) / step;
-            } else {
-                nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-            }
-            if (n > 0) {
-                return mp_obj_new_int(start + step * randbelow(n));
-            } else {
-                nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-            }
-        }
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_randrange_obj, 1, 3, mod_random_randrange);
-
-STATIC mp_obj_t mod_random_randint(mp_obj_t a_in, mp_obj_t b_in) {
-    mp_int_t a = mp_obj_get_int(a_in);
-    mp_int_t b = mp_obj_get_int(b_in);
-    if (a <= b) {
-        return mp_obj_new_int(a + randbelow(b - a + 1));
-    } else {
-        nlr_raise(mp_obj_new_exception(&mp_type_ValueError));
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_randint_obj, mod_random_randint);
-
-STATIC mp_obj_t mod_random_choice(mp_obj_t seq) {
-    mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
-    if (len > 0) {
-        return mp_obj_subscr(seq, mp_obj_new_int(randbelow(len)), MP_OBJ_SENTINEL);
-    } else {
-        nlr_raise(mp_obj_new_exception(&mp_type_IndexError));
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_choice_obj, mod_random_choice);
-
-#if MICROPY_PY_BUILTINS_FLOAT
-
-// returns a number in the range [0..1) using RNG to fill in the fraction bits
-STATIC mp_float_t randfloat(void) {
-    #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-    typedef uint64_t mp_float_int_t;
-    #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-    typedef uint32_t mp_float_int_t;
-    #endif
-    union {
-        mp_float_t f;
-        #if MP_ENDIANNESS_LITTLE
-        struct { mp_float_int_t frc:MP_FLOAT_FRAC_BITS, exp:MP_FLOAT_EXP_BITS, sgn:1; } p;
-        #else
-        struct { mp_float_int_t sgn:1, exp:MP_FLOAT_EXP_BITS, frc:MP_FLOAT_FRAC_BITS; } p;
-        #endif
-    } u;
-    u.p.sgn = 0;
-    u.p.exp = (1 << (MP_FLOAT_EXP_BITS - 1)) - 1;
-    if (MP_FLOAT_FRAC_BITS <= 30) {
-        u.p.frc = rand30();
-    } else {
-        u.p.frc = ((uint64_t)rand30() << 30) | (uint64_t)rand30();
-    }
-    return u.f - 1;
-}
-
-STATIC mp_obj_t mod_random_random(void) {
-    return mp_obj_new_float(randfloat());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_random_random_obj, mod_random_random);
-
-STATIC mp_obj_t mod_random_uniform(mp_obj_t a_in, mp_obj_t b_in) {
-    mp_float_t a = mp_obj_get_float(a_in);
-    mp_float_t b = mp_obj_get_float(b_in);
-    return mp_obj_new_float(a + (b - a) * randfloat());
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform);
-
-#endif
-
-STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
-    { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_random_getrandbits_obj) },
-    { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_random_randrange_obj) },
-    { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_random_randint_obj) },
-    { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_random_choice_obj) },
-#if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mod_random_random_obj) },
-    { MP_ROM_QSTR(MP_QSTR_uniform), MP_ROM_PTR(&mod_random_uniform_obj) },
-#endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table);
-
-const mp_obj_module_t random_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*)&mp_module_random_globals,
-};
-
-#endif // MICROPY_PY_HW_RNG
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 24f41db0e..dc319a440 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -183,16 +183,9 @@ extern const struct _mp_obj_module_t supervisor_module;
 extern const struct _mp_obj_module_t gamepad_module;
 
 extern const struct _mp_obj_module_t mp_module_ubluepy;
-extern const struct _mp_obj_module_t random_module;
 
 extern const struct _mp_obj_module_t ble_module;
 
-#if MICROPY_PY_HW_RNG
-#define RANDOM_MODULE                        { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&random_module) },
-#else
-#define RANDOM_MODULE
-#endif
-
 #if MICROPY_PY_UBLUEPY
 #define UBLUEPY_MODULE                      { MP_ROM_QSTR(MP_QSTR_ubluepy), MP_ROM_PTR(&mp_module_ubluepy) },
 #else
@@ -221,7 +214,6 @@ extern const struct _mp_obj_module_t ble_module;
     { MP_OBJ_NEW_QSTR (MP_QSTR_supervisor      ), (mp_obj_t)&supervisor_module      }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_gamepad         ), (mp_obj_t)&gamepad_module         }, \
     { MP_OBJ_NEW_QSTR (MP_QSTR_time            ), (mp_obj_t)&time_module            }, \
-    RANDOM_MODULE \
     BLE_MODULE \
     UBLUEPY_MODULE \
 
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index c9d141b26..1e1ebf32e 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -25,7 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include <errno.h>
 #include <string.h>
 
 #include "mphalport.h"
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index fe43cec16..2aa2a4f30 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -30,12 +30,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "hal_gpio.h"
 #include "lib/utils/interrupt_char.h"
-#include "nrf.h"
-#include NRF5_HAL_H
 #include "nrfx_uart.h"
-#include "pin.h"
 #include "py/mpconfig.h"
 
 extern nrfx_uart_t serial_instance;
@@ -49,8 +45,8 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
 int mp_hal_stdin_rx_chr(void);
 void mp_hal_stdout_tx_str(const char *str);
 bool mp_hal_stdin_any(void);
-
-#define mp_hal_delay_us(us)     NRFX_DELAY_US((uint32_t) us)
+void mp_hal_delay_ms(mp_uint_t ms);
+#define mp_hal_delay_us(us)     NRFX_DELAY_US((uint32_t) (us))
 
 #endif