From 8afa9878fd0165a40d6b693d7328aeedd34c0fc8 Mon Sep 17 00:00:00 2001 From: Mike Weiblen Date: Wed, 22 Apr 2020 23:39:02 -0600 Subject: tools: upload .bin and .uf2 for Itaca uChip boards uChip boards are shipped with an Arduino bootloader. The .bin files can be installed without first installing a .uf2 bootloader. See https://github.com/adafruit/circuitpython/issues/2798 --- tools/build_board_info.py | 1 + 1 file changed, 1 insertion(+) (limited to 'tools') 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, -- cgit v1.2.3 From 85a4dd939f282ce8739f24aaf420505a590593cb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 27 Apr 2020 08:08:12 -0500 Subject: build_memory_info: Drop support for old FLASH region name This led to incorrect results about free memory in the stm and i.mx ports --- tools/build_memory_info.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py index 93b4c1e82..d4c5c848e 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,11 +63,7 @@ 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 -- cgit v1.2.3 From 1efa7076b0748a2c5276b1c5a02296d4532eb905 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Mon, 27 Apr 2020 15:43:13 -0500 Subject: build_memory_info: Report used, free, and total memory .. intead of just free and total as before. --- tools/build_memory_info.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/build_memory_info.py b/tools/build_memory_info.py index d4c5c848e..808b70bd2 100644 --- a/tools/build_memory_info.py +++ b/tools/build_memory_info.py @@ -66,10 +66,12 @@ for region in regions: 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 -- cgit v1.2.3