Merge pull request #88 from adafruit/develop

adding support for nrf52833

Author: hathach

Makefile

@@ -21,7 +21,7 @@ SD_FILENAME  = $(SD_NAME)_nrf52_$(SD_VERSION)
 SD_API_PATH  = $(SD_PATH)/$(SD_FILENAME)_API
 SD_HEX       = $(SD_PATH)/$(SD_FILENAME)_softdevice.hex
 
-LD_FILE      = $(SRC_PATH)/linker/$(SD_NAME)_v$(word 1, $(subst ., ,$(SD_VERSION))).ld
+LD_FILE      = $(SRC_PATH)/linker/$(MCU_SUB_VARIANT)_$(SD_NAME)_v$(word 1, $(subst ., ,$(SD_VERSION))).ld
 
 MERGED_FNAME = $(OUTPUT_FILENAME)_$(SD_NAME)_$(SD_VERSION)
 
@@ -76,23 +76,33 @@ remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-ou
 #*********************************
 BOARD_LIST = $(sort $(subst .h,,$(subst src/boards/,,$(wildcard src/boards/*))))
 
-NRF52832_BOARDLIST = feather_nrf52832
-IS_52832 = $(filter $(BOARD),$(NRF52832_BOARDLIST))
-
 ifeq ($(filter $(BOARD),$(BOARD_LIST)),)
   $(info You must provide a BOARD parameter with 'BOARD='. Supported boards are:)
   $(info $(BOARD_LIST))
   $(error Invalid BOARD specified)
 endif
 
+# Build directory
 BUILD = _build-$(BOARD)
 
-ifneq ($(IS_52832),)
-SD_NAME = s132
-DFU_DEV_REV = 0xADAF
+# Board specific
+-include src/boards/$(BOARD)/board.mk
+
+# MCU_SUB_VARIANT can be nrf52 (nrf52832), nrf52833, nrf52840
+ifeq ($(MCU_SUB_VARIANT),nrf52)
+  SD_NAME = s132
+  DFU_DEV_REV = 0xADAF
+  MCU_FLAGS = -DNRF52 -DNRF52832_XXAA -DS132
+else ifeq ($(MCU_SUB_VARIANT),nrf52833)
+  SD_NAME = s140
+  DFU_DEV_REV = 52840
+  MCU_FLAGS = -DNRF52833_XXAA -DS140
+else ifeq ($(MCU_SUB_VARIANT),nrf52840)
+  SD_NAME = s140
+  DFU_DEV_REV = 52840
+  MCU_FLAGS = -DNRF52840_XXAA -DS140
 else
-SD_NAME = s140
-DFU_DEV_REV = 52840
+  $(error Sub Variant $(MCU_SUB_VARIANT) is unknown)
 endif
 
 #******************************************************************************
@@ -108,7 +118,8 @@ C_SOURCE_FILES += $(SRC_PATH)/dfu_init.c
 
 # nrfx
 C_SOURCE_FILES += $(NRFX_PATH)/drivers/src/nrfx_power.c
-C_SOURCE_FILES += $(NRFX_PATH)/hal/nrf_nvmc.c
+C_SOURCE_FILES += $(NRFX_PATH)/drivers/src/nrfx_nvmc.c
+C_SOURCE_FILES += $(NRFX_PATH)/mdk/system_$(MCU_SUB_VARIANT).c
 
 # SDK 11 files
 C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader.c
@@ -134,10 +145,8 @@ C_SOURCE_FILES += $(SDK_PATH)/libraries/hci/hci_slip.c
 C_SOURCE_FILES += $(SDK_PATH)/libraries/hci/hci_transport.c
 C_SOURCE_FILES += $(SDK_PATH)/libraries/util/nrf_assert.c
 
-ifneq ($(IS_52832),)
-
-C_SOURCE_FILES += $(NRFX_PATH)/mdk/system_nrf52.c
-
+# UART or USB Serial
+ifeq ($(MCU_SUB_VARIANT),nrf52)
 C_SOURCE_FILES += $(SDK_PATH)/libraries/uart/app_uart.c
 C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/uart/nrf_drv_uart.c
 C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/common/nrf_drv_common.c
@@ -147,25 +156,19 @@ IPATH += $(SDK_PATH)/drivers_nrf/common
 IPATH += $(SDK_PATH)/drivers_nrf/uart
 
 else
-
 # src
 C_SOURCE_FILES += $(SRC_PATH)/usb/usb_desc.c
 C_SOURCE_FILES += $(SRC_PATH)/usb/usb.c
 C_SOURCE_FILES += $(SRC_PATH)/usb/msc_uf2.c
 C_SOURCE_FILES += $(SRC_PATH)/usb/uf2/ghostfat.c
 
-# nrfx
-C_SOURCE_FILES += $(NRFX_PATH)/mdk/system_nrf52840.c
-
-# Tinyusb stack
+# TinyUSB stack
 C_SOURCE_FILES += $(TUSB_PATH)/portable/nordic/nrf5x/dcd_nrf5x.c
-C_SOURCE_FILES += $(TUSB_PATH)/portable/nordic/nrf5x/hal_nrf5x.c
 C_SOURCE_FILES += $(TUSB_PATH)/common/tusb_fifo.c
 C_SOURCE_FILES += $(TUSB_PATH)/device/usbd.c
 C_SOURCE_FILES += $(TUSB_PATH)/device/usbd_control.c
 C_SOURCE_FILES += $(TUSB_PATH)/class/cdc/cdc_device.c
 C_SOURCE_FILES += $(TUSB_PATH)/class/msc/msc_device.c
-C_SOURCE_FILES += $(TUSB_PATH)/class/custom/custom_device.c
 C_SOURCE_FILES += $(TUSB_PATH)/tusb.c
 
 endif
@@ -174,11 +177,7 @@ endif
 #******************************************************************************
 # Assembly Files
 #******************************************************************************
-ifneq ($(IS_52832),)
-ASM_SOURCE_FILES  = $(NRFX_PATH)/mdk/gcc_startup_nrf52.S
-else
-ASM_SOURCE_FILES  = $(NRFX_PATH)/mdk/gcc_startup_nrf52840.S
-endif
+ASM_SOURCE_FILES  = $(NRFX_PATH)/mdk/gcc_startup_$(MCU_SUB_VARIANT).S
 
 #******************************************************************************
 # INCLUDE PATH
@@ -198,6 +197,7 @@ IPATH += $(NRFX_PATH)
 IPATH += $(NRFX_PATH)/mdk
 IPATH += $(NRFX_PATH)/hal
 IPATH += $(NRFX_PATH)/drivers/include
+IPATH += $(NRFX_PATH)/drivers/src
 
 IPATH += $(SDK11_PATH)/libraries/bootloader_dfu/hci_transport
 IPATH += $(SDK11_PATH)/libraries/bootloader_dfu
@@ -245,22 +245,14 @@ CFLAGS += -DSWI_DISABLE0
 CFLAGS += -DSOFTDEVICE_PRESENT
 CFLAGS += -DFLOAT_ABI_HARD
 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
+CFLAGS += $(MCU_FLAGS)
 
 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"'
 CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"'
 
 _VER = $(subst ., ,$(word 1, $(subst -, ,$(GIT_VERSION))))
 CFLAGS += -DMK_BOOTLOADER_VERSION='($(word 1,$(_VER)) << 16) + ($(word 2,$(_VER)) << 8) + $(word 3,$(_VER))'
 
-ifneq ($(IS_52832),)
-CFLAGS += -DNRF52
-CFLAGS += -DNRF52832_XXAA
-CFLAGS += -DS132
-else
-CFLAGS += -DNRF52840_XXAA
-CFLAGS += -DS140
-endif
-
 
 #******************************************************************************
 # Linker Flags
@@ -289,14 +281,7 @@ ASMFLAGS += -DBLE_STACK_SUPPORT_REQD
 ASMFLAGS += -DSWI_DISABLE0
 ASMFLAGS += -DSOFTDEVICE_PRESENT
 ASMFLAGS += -DFLOAT_ABI_HARD
-
-ifneq ($(IS_52832),)
-ASMFLAGS += -DNRF52
-ASMFLAGS += -DS132
-else
-ASMFLAGS += -DNRF52840_XXAA
-ASMFLAGS += -DS140
-endif
+ASMFLAGS += $(MCU_FLAGS)
 
 C_SOURCE_FILE_NAMES = $(notdir $(C_SOURCE_FILES))
 C_PATHS = $(call remduplicates, $(dir $(C_SOURCE_FILES) ) )

README.md

@@ -109,7 +109,7 @@ You must have have  a J-Link available to "unbrick" your device.
 Prerequisites
 
 - ARM GCC
-- Nordic's [nRF5x Command Line Tools](http://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.tools%2Fdita%2Ftools%2Fnrf5x_command_line_tools%2Fnrf5x_installation.html)
+- Nordic's [nRF5x Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
 
 To build:
 

lib/nrfx

@@ -119,11 +119,23 @@ __STATIC_INLINE void apply_config(nrf_drv_uart_t const * p_instance, nrf_drv_uar
         nrf_gpio_cfg_input(p_config->pselrxd, NRF_GPIO_PIN_NOPULL);
     }
 
+    nrf_uarte_config_t uarte_cfg =
+    {
+      .hwfc = (nrf_uarte_hwfc_t) p_config->hwfc,
+      .parity = (nrf_uarte_parity_t) p_config->parity
+    };
+
+    nrf_uart_config_t uart_cfg =
+    {
+      .hwfc = (nrf_uart_hwfc_t) p_config->hwfc,
+      .parity = (nrf_uart_parity_t) p_config->parity
+    };
+
     CODE_FOR_UARTE
     (
         nrf_uarte_baudrate_set(p_instance->reg.p_uarte, (nrf_uarte_baudrate_t)p_config->baudrate);
-        nrf_uarte_configure(p_instance->reg.p_uarte, (nrf_uarte_parity_t)p_config->parity,
-                            (nrf_uarte_hwfc_t)p_config->hwfc);
+//        nrf_uarte_configure(p_instance->reg.p_uarte, (nrf_uarte_parity_t)p_config->parity, (nrf_uarte_hwfc_t)p_config->hwfc);
+        nrf_uarte_configure(p_instance->reg.p_uarte, &uarte_cfg);
         nrf_uarte_txrx_pins_set(p_instance->reg.p_uarte, p_config->pseltxd, p_config->pselrxd);
         if (p_config->hwfc == NRF_UART_HWFC_ENABLED)
         {
@@ -142,7 +154,8 @@ __STATIC_INLINE void apply_config(nrf_drv_uart_t const * p_instance, nrf_drv_uar
     CODE_FOR_UART
     (
         nrf_uart_baudrate_set(p_instance->reg.p_uart, p_config->baudrate);
-        nrf_uart_configure(p_instance->reg.p_uart, p_config->parity, p_config->hwfc);
+//        nrf_uart_configure(p_instance->reg.p_uart, p_config->parity, p_config->hwfc);
+        nrf_uart_configure(p_instance->reg.p_uart, &uart_cfg);
         nrf_uart_txrx_pins_set(p_instance->reg.p_uart, p_config->pseltxd, p_config->pselrxd);
         if (p_config->hwfc == NRF_UART_HWFC_ENABLED)
         {

lib/sdk/components/drivers_nrf/uart/nrf_drv_uart.c

@@ -44,7 +44,8 @@
 #include "app_uart.h"
 #include "nrf_error.h"
 
-#ifdef NRF52840_XXAA
+// nRF has native usb peripheral
+#ifdef NRF_USBD
 #include "tusb.h"
 #endif
 
@@ -121,13 +122,17 @@ static uint32_t send_tx_byte_end(void);
  */
 uint32_t (*send_tx_byte) (void) = send_tx_byte_default;
 
-#ifdef NRF52840_XXAA
-  static uint32_t serial_put(char ch)
-  {
-    return tud_cdc_write_char(ch) ? NRF_SUCCESS : NRF_ERROR_NO_MEM;
-  }
+#ifdef NRF_USBD
+
+static uint32_t serial_put(char ch)
+{
+  return tud_cdc_write_char(ch) ? NRF_SUCCESS : NRF_ERROR_NO_MEM;
+}
+
 #else
-  #define serial_put    app_uart_put
+
+#define serial_put    app_uart_put
+
 #endif
 
 static uint32_t send_tx_byte_end(void)
@@ -345,7 +350,7 @@ static bool rx_buffer_overflowed(void)
     return false;
 }
 
-#ifdef NRF52840_XXAA
+#ifdef NRF_USBD
 
 static uint32_t slip_uart_open(void)
 {
@@ -441,7 +446,8 @@ uint32_t hci_slip_open()
 uint32_t hci_slip_close()
 {
     m_current_state   = SLIP_OFF;
-#ifdef NRF52840_XXAA
+
+#ifdef NRF_USBD
     return NRF_SUCCESS;
 #else
     uint32_t err_code = app_uart_close();

lib/sdk/components/libraries/hci/hci_slip.c

@@ -40,11 +40,11 @@
 #define INVALID_OPCODE              0x00    /**< Invalid op code identifier. */
 
 #ifdef NRF51
-#define SOC_MAX_WRITE_SIZE          1024    /**< Maximum write size allowed for a single call to \ref sd_flash_write as specified in the SoC API on the nRF51. */
-#elif defined(NRF52832_XXAA) || defined(NRF52840_XXAA)
-#define SOC_MAX_WRITE_SIZE          4096    /**< Maximum write size allowed for a single call to \ref sd_flash_write as specified in the SoC API on the nRF52. */
+  #define SOC_MAX_WRITE_SIZE          1024    /**< Maximum write size allowed for a single call to \ref sd_flash_write as specified in the SoC API on the nRF51. */
+#elif defined(NRF52_SERIES)
+  #define SOC_MAX_WRITE_SIZE          4096    /**< Maximum write size allowed for a single call to \ref sd_flash_write as specified in the SoC API on the nRF52. */
 #else
-#error No target defined
+  #error No target defined
 #endif
 
 

lib/sdk11/components/drivers_nrf/pstorage/pstorage_raw.c

@@ -32,19 +32,19 @@
 
 #include "boards.h"
 
-#ifdef NRF52840_XXAA
+#ifdef NRF_USBD
 #include "tusb.h"
 #endif
 
 #define APP_TIMER_PRESCALER    0
 
 #define IRQ_ENABLED            0x01                    /**< Field identifying if an interrupt is enabled. */
 
-/**< Maximum number of interrupts available. */
+/**< Maximum number of interrupts available. (from IRQn_Type) */
 #if defined(NRF52832_XXAA)
-#define MAX_NUMBER_INTERRUPTS  39
-#elif defined(NRF52840_XXAA)
-#define MAX_NUMBER_INTERRUPTS  48
+  #define MAX_NUMBER_INTERRUPTS  39
+#elif defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
+  #define MAX_NUMBER_INTERRUPTS  48
 #endif
 
 /**@brief Enumeration for specifying current bootloader status.
@@ -119,17 +119,16 @@ static void wait_for_events(void)
 
     // Feed all Watchdog just in case application enable it
     // WDT cannot be disabled once started. It even last through soft reset (NVIC Reset)
-    if ( nrf_wdt_started() )
+    if ( nrf_wdt_started(NRF_WDT) )
     {
-      for (uint8_t i=0; i<8; i++) nrf_wdt_reload_request_set(i);
+      for (uint8_t i=0; i<8; i++) nrf_wdt_reload_request_set(NRF_WDT, i);
     }
 
     // Event received. Process it from the scheduler.
     app_sched_execute();
 
-#ifdef NRF52840_XXAA
+#ifdef NRF_USBD
     // skip if usb is not inited ( e.g OTA / finializing sd/bootloader )
-    extern bool usb_inited(void);
     if ( tusb_inited() )
     {
       tud_task();
@@ -194,8 +193,8 @@ static void bootloader_settings_save(bootloader_settings_t * p_settings)
   }
   else
   {
-    nrf_nvmc_page_erase(BOOTLOADER_SETTINGS_ADDRESS);
-    nrf_nvmc_write_words(BOOTLOADER_SETTINGS_ADDRESS, (uint32_t *) p_settings, sizeof(bootloader_settings_t) / 4);
+    nrfx_nvmc_page_erase(BOOTLOADER_SETTINGS_ADDRESS);
+    nrfx_nvmc_words_write(BOOTLOADER_SETTINGS_ADDRESS, (uint32_t *) p_settings, sizeof(bootloader_settings_t) / 4);
 
     pstorage_callback_handler(&m_bootsettings_handle, PSTORAGE_STORE_OP_CODE, NRF_SUCCESS, (uint8_t *) p_settings, sizeof(bootloader_settings_t));
   }

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -31,7 +31,7 @@ __root    const uint32_t m_uicr_bootloader_start_address @ NRF_UICR_BOOT_START_A
 
 #endif
 
-#if defined(NRF52832_XXAA) || defined(NRF52840_XXAA)
+#if defined(NRF52_SERIES)
 #if defined ( __CC_ARM )
 
 uint8_t m_mbr_params_page[CODE_PAGE_SIZE]   __attribute__((at(BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS))) __attribute__((used));          /**< This variable reserves a codepage for mbr parameters, to ensure the compiler doesn't locate any code or variables at his location. */
@@ -50,7 +50,7 @@ __no_init uint8_t m_mbr_params_page[CODE_PAGE_SIZE]     @ BOOTLOADER_MBR_PARAMS_
 __root    const uint32_t m_uicr_mbr_params_page_address @ NRF_UICR_MBR_PARAMS_PAGE_ADDRESS = BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS;    /**< This variable ensures that the linker script will write the bootloader start address to the UICR register. This value will be written in the HEX file and thus written to UICR when the bootloader is flashed into the chip. */
 
 #endif
-#endif // defined(NRF52832_XXAA) || defined(NRF52840_XXAA)
+#endif // NRF52_SERIES
 
 
 void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_settings)

lib/sdk11/components/libraries/bootloader_dfu/bootloader_settings.c

@@ -151,7 +151,7 @@ static void dfu_prepare_func_app_erase(uint32_t image_size)
 
     for ( uint32_t i = 0; i < page_count; i++ )
     {
-      nrf_nvmc_page_erase(DFU_BANK_0_REGION_START + i * CODE_PAGE_SIZE);
+      nrfx_nvmc_page_erase(DFU_BANK_0_REGION_START + i * CODE_PAGE_SIZE);
     }
 
     // invoke complete callback

lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c

@@ -30,22 +30,20 @@
 #include "app_util.h"
 
 #define NRF_UICR_BOOT_START_ADDRESS         (NRF_UICR_BASE + 0x14)      /**< Register where the bootloader start address is stored in the UICR register. */
-
-#if defined(NRF52832_XXAA) || defined(NRF52840_XXAA)
 #define NRF_UICR_MBR_PARAMS_PAGE_ADDRESS    (NRF_UICR_BASE + 0x18)      /**< Register where the mbr params page is stored in the UICR register. (Only in use in nRF52 MBR).*/
-#endif                                                              
 
 #define CODE_REGION_1_START                 SD_SIZE_GET(MBR_SIZE)       /**< This field should correspond to the size of Code Region 0, (which is identical to Start of Code Region 1), found in UICR.CLEN0 register. This value is used for compile safety, as the linker will fail if application expands into bootloader. Runtime, the bootloader will use the value found in UICR.CLEN0. */
 #define SOFTDEVICE_REGION_START             MBR_SIZE                    /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */
 #define CODE_PAGE_SIZE                      0x1000                      /**< Size of a flash codepage. Used for size of the reserved flash space in the bootloader region. Will be runtime checked against NRF_UICR->CODEPAGESIZE to ensure the region is correct. */
 
-
-#if defined(NRF52832_XXAA)
+// Flash = 512 KB
+#if defined(NRF52832_XXAA) || defined(NRF52833_XXAA)
 
 #define BOOTLOADER_REGION_START             0x00074000                  /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */
 #define BOOTLOADER_SETTINGS_ADDRESS         0x0007F000                  /**< The field specifies the page location of the bootloader settings address. */
 #define BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS  0x0007E000                  /**< The field specifies the page location of the mbr params page address. */
 
+// Flash = 1024 KB
 #elif  defined(NRF52840_XXAA)
 
 #define BOOTLOADER_REGION_START             0x000F4000                  /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */