Merge pull request #235 from gamnes/master

Include support for nRF52 board ID 1101

Author: c1728p9

binaries/l1_nrf52-dk.bin

@@ -53,6 +53,7 @@ def __init__(self, name, target, binary):
                 "0400": BoardInfo(  "maxwsnenv",            "maxwsnenv",        "l1_maxwsnenv.bin",     ),
                 "0405": BoardInfo(  "max32600mbed",         "max32600mbed",     "l1_max32600mbed.bin",  ),
                 "1100": BoardInfo(  "nRF51-DK",             "nrf51",            "l1_nrf51-dk.bin",      ),
+                "1101": BoardInfo(  "nRF52-DK",             "nrf52",            "l1_nrf52-dk.bin",      ),
                 "2201": BoardInfo(  "WIZwik_W7500",         "w7500",            "l1_w7500mbed.bin",     ),
                 "9900": BoardInfo(  "Microbit",             "nrf51",            "l1_microbit.bin",      ),
                 "1114": BoardInfo("mbed LPC1114FN28",       "lpc11xx_32",       "l1_mbed_LPC1114FN28.bin",),

pyOCD/board/mbed_board.py

@@ -19,10 +19,6 @@
 from .memory_map import (FlashRegion, RamRegion, MemoryMap)
 import logging
 
-# NRF52 specific registers
-RESET = 0x40000544
-RESET_ENABLE = (1 << 0)
-
 class NRF52(CortexM):
 
     memoryMap = MemoryMap(
@@ -38,9 +34,4 @@ def resetn(self):
         reset a core. After a call to this function, the core
         is running
         """
-        #Regular reset will kick NRF out of DBG mode
-        logging.debug("target_nrf52.reset: enable reset pin")
-        self.writeMemory(RESET, RESET_ENABLE)
-        #reset
-        logging.debug("target_nrf52.reset: trigger nRST pin")
         CortexM.reset(self)