Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion TEST_APPS/device/socket_app/mbed_app.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
],
"target_overrides": {
"*": {
"target.features_add": ["LWIP", "COMMON_PAL"],
"mbed-trace.enable": 1,
"platform.stdio-baud-rate": 115200,
"platform.stdio-convert-newlines": true,
Expand Down
13 changes: 4 additions & 9 deletions tools/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,7 @@


ALLOWED_FEATURES = [
"BOOTLOADER","UVISOR", "BLE", "CLIENT", "IPV4", "LWIP", "COMMON_PAL", "STORAGE",
"NANOSTACK","CRYPTOCELL310",
# Nanostack configurations
"LOWPAN_BORDER_ROUTER", "LOWPAN_HOST", "LOWPAN_ROUTER", "NANOSTACK_FULL",
"THREAD_BORDER_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER",
"ETHERNET_HOST",
"BOOTLOADER", "BLE", "LWIP", "STORAGE", "NANOSTACK", "CRYPTOCELL310",
]

# Base class for all configuration exceptions
Expand Down Expand Up @@ -749,7 +744,7 @@ def _generate_bootloader_build(self, rom_start, rom_size):
if start > rom_start + rom_size:
raise ConfigException("Not enough memory on device to fit all "
"application regions")

@staticmethod
def _find_sector(address, sectors):
target_size = -1
Expand All @@ -762,13 +757,13 @@ def _find_sector(address, sectors):
if (target_size < 0):
raise ConfigException("No valid sector found")
return target_start, target_size

@staticmethod
def _align_floor(address, sectors):
target_start, target_size = Config._find_sector(address, sectors)
sector_num = (address - target_start) // target_size
return target_start + (sector_num * target_size)

@staticmethod
def _align_ceiling(address, sectors):
target_start, target_size = Config._find_sector(address, sectors)
Expand Down