summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Epler <jepler@gmail.com>2020-04-27 08:08:12 -0500
committerJeff Epler <jepler@gmail.com>2020-04-27 09:12:45 -0500
commit85a4dd939f282ce8739f24aaf420505a590593cb (patch)
treeb434c2e7811dbb9a1b590a16226aa9e0ff7042f5
parent6f6dc835d2c9a6080a58fb0164b9b0914e0b652b (diff)
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
-rw-r--r--tools/build_memory_info.py8
1 files changed, 2 insertions, 6 deletions
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