ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1385 from jpbrucker/s110_OTA_v2 

targets.py: NRF51: support S110 builds for OTA and BOOT targets
pull/1387/merge
Mihail Stoyanov 2015-10-20 12:39:33 +01:00
parent 856efdc67d 0bb9fb36b7
commit f06afecf3c
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
workspace_tools/targets.py
View File

@ -1119,23 +1119,39 @@ class MCU_NRF51_16K(MCU_NRF51_16K_BASE):
self.extra_labels += ['MCU_NRF51_16K_S130'] self.extra_labels += ['MCU_NRF51_16K_S130']
self.macros += ['TARGET_MCU_NRF51_16K_S130'] self.macros += ['TARGET_MCU_NRF51_16K_S130']
class MCU_NRF51_16K_S110(MCU_NRF51_16K_BASE): class MCU_NRF51_S110:
""" Interface for overwriting the default SoftDevices """
def __init__(self): def __init__(self):
MCU_NRF51_16K_BASE.__init__(self) self.EXPECTED_SOFTDEVICES_WITH_OFFSETS = [
{
'name' : 's110_nrf51822_8.0.0_softdevice.hex',
'boot' : 's110_nrf51822_8.0.0_bootloader.hex',
'offset' : 0x18000
},
{
'name' : 's110_nrf51822_7.1.0_softdevice.hex',
'boot' : 's110_nrf51822_7.1.0_bootloader.hex',
'offset' : 0x16000
}
]
self.extra_labels += ['MCU_NRF51_16K_S110'] self.extra_labels += ['MCU_NRF51_16K_S110']
self.macros += ['TARGET_MCU_NRF51_16K_S110'] self.macros += ['TARGET_MCU_NRF51_16K_S110']
class MCU_NRF51_16K_S110(MCU_NRF51_16K_BASE, MCU_NRF51_S110):
def __init__(self):
MCU_NRF51_16K_BASE.__init__(self)
MCU_NRF51_S110.__init__(self)
class MCU_NRF51_16K_BOOT(MCU_NRF51_16K_BOOT_BASE): class MCU_NRF51_16K_BOOT(MCU_NRF51_16K_BOOT_BASE):
def __init__(self): def __init__(self):
MCU_NRF51_16K_BOOT_BASE.__init__(self) MCU_NRF51_16K_BOOT_BASE.__init__(self)
self.extra_labels += ['MCU_NRF51_16K_S130'] self.extra_labels += ['MCU_NRF51_16K_S130']
self.macros += ['TARGET_MCU_NRF51_16K_S130'] self.macros += ['TARGET_MCU_NRF51_16K_S130']
class MCU_NRF51_16K_BOOT_S110(MCU_NRF51_16K_BOOT_BASE): class MCU_NRF51_16K_BOOT_S110(MCU_NRF51_16K_BOOT_BASE, MCU_NRF51_S110):
def __init__(self): def __init__(self):
MCU_NRF51_16K_BOOT_BASE.__init__(self) MCU_NRF51_16K_BOOT_BASE.__init__(self)
self.extra_labels += ['MCU_NRF51_16K_S110'] MCU_NRF51_S110.__init__(self)
self.macros += ['TARGET_MCU_NRF51_16K_S110']
class MCU_NRF51_16K_OTA(MCU_NRF51_16K_OTA_BASE): class MCU_NRF51_16K_OTA(MCU_NRF51_16K_OTA_BASE):
def __init__(self): def __init__(self):
@ -1143,11 +1159,10 @@ class MCU_NRF51_16K_OTA(MCU_NRF51_16K_OTA_BASE):
self.extra_labels += ['MCU_NRF51_16K_S130'] self.extra_labels += ['MCU_NRF51_16K_S130']
self.macros += ['TARGET_MCU_NRF51_16K_S130'] self.macros += ['TARGET_MCU_NRF51_16K_S130']
class MCU_NRF51_16K_OTA_S110(MCU_NRF51_16K_OTA_BASE): class MCU_NRF51_16K_OTA_S110(MCU_NRF51_16K_OTA_BASE, MCU_NRF51_S110):
def __init__(self): def __init__(self):
MCU_NRF51_16K_OTA_BASE.__init__(self) MCU_NRF51_16K_OTA_BASE.__init__(self)
self.extra_labels += ['MCU_NRF51_16K_S110'] MCU_NRF51_S110.__init__(self)
self.macros += ['TARGET_MCU_NRF51_16K_S110']
# 32KB MCU version, e.g. Nordic nRF51-DK, nRF51-Dongle, etc. # 32KB MCU version, e.g. Nordic nRF51-DK, nRF51-Dongle, etc.
@ -1390,18 +1405,6 @@ class NRF51_DONGLE_OTA(MCU_NRF51_32K_OTA):
class NRF51_MICROBIT(MCU_NRF51_16K_S110): class NRF51_MICROBIT(MCU_NRF51_16K_S110):
def __init__(self): def __init__(self):
MCU_NRF51_16K_S110.__init__(self) MCU_NRF51_16K_S110.__init__(self)
self.EXPECTED_SOFTDEVICES_WITH_OFFSETS = [
{
'name' : 's110_nrf51822_8.0.0_softdevice.hex',
'boot' : 's110_nrf51822_8.0.0_bootloader.hex',
'offset' : 0x18000
},
{
'name' : 's110_nrf51822_7.1.0_softdevice.hex',
'boot' : 's110_nrf51822_7.1.0_bootloader.hex',
'offset' : 0x16000
}
]
self.macros += ['TARGET_NRF_LFCLK_RC'] self.macros += ['TARGET_NRF_LFCLK_RC']
class NRF51_MICROBIT_BOOT(MCU_NRF51_16K_BOOT_S110): class NRF51_MICROBIT_BOOT(MCU_NRF51_16K_BOOT_S110):