diff options
| author | dherrada <33632497+dherrada@users.noreply.github.com> | 2020-05-12 12:26:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 12:26:02 -0400 |
| commit | c534a872a2b5a2d5e6b7543f56539afb24261443 (patch) | |
| tree | a1b6f8333811dfb103cdfdbcf2db33fea896dacb /tools | |
| parent | 6490137812eb9f0c0b08ad81bc77ea21f5f31d04 (diff) | |
| parent | 62b835ad7637c5336f210ab688289dc607bec661 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_board_info.py | 1 | ||||
| -rw-r--r-- | tools/build_memory_info.py | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/tools/build_board_info.py b/tools/build_board_info.py index 543224fae..3594f2ae7 100644 --- a/tools/build_board_info.py +++ b/tools/build_board_info.py @@ -48,6 +48,7 @@ extension_by_board = { "feather_m0_basic": BIN_UF2, "feather_m0_rfm69": BIN_UF2, "feather_m0_rfm9x": BIN_UF2, + "uchip": BIN_UF2, # nRF52840 dev kits that may not have UF2 bootloaders, "makerdiary_nrf52840_mdk": HEX, diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py index 93b4c1e82..808b70bd2 100644 --- a/tools/build_memory_info.py +++ b/tools/build_memory_info.py @@ -52,7 +52,7 @@ regions = {} with open(sys.argv[1], "r") as f: for line in f: line = line.strip() - if line.startswith(("FLASH_FIRMWARE", "FLASH", "RAM")): + if line.startswith(("FLASH_FIRMWARE", "RAM")): regions[line.split()[0]] = line.split("=")[-1] for region in regions: @@ -63,17 +63,15 @@ for region in regions: space = M_PATTERN.sub(M_REPLACE, space) regions[region] = int(eval(space)) -# TODO Remove check for both FLASH_FIRMWARE and FLASH after all ports are converted to use FLASH_FIRMWARE. -try: - firmware_region = regions["FLASH_FIRMWARE"] -except KeyError: - firmware_region = regions["FLASH"] +firmware_region = regions["FLASH_FIRMWARE"] ram_region = regions["RAM"] -free_flash = firmware_region - text - data -free_ram = ram_region - data - bss -print("{} bytes free in flash firmware space out of {} bytes ({}kB).".format(free_flash, firmware_region, firmware_region / 1024)) -print("{} bytes free in ram for stack and heap out of {} bytes ({}kB).".format(free_ram, ram_region, ram_region / 1024)) +used_flash = data + text +free_flash = firmware_region - used_flash +used_ram = data + bss +free_ram = ram_region - used_ram +print("{} bytes used, {} bytes free in flash firmware space out of {} bytes ({}kB).".format(used_flash, free_flash, firmware_region, firmware_region / 1024)) +print("{} bytes used, {} bytes free in ram for stack and heap out of {} bytes ({}kB).".format(used_ram, free_ram, ram_region, ram_region / 1024)) print() # Check that we have free flash space. GCC doesn't fail when the text + data |