OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix assemble.py tool for compatibility 

This accounts for changes in the Zephyr build which include:

1) Flash areas are prefixed with `DT_`
2) The generated DTS was renamed to generated_dts_board_unfixed.h
3) The build tree has an extra "zephyr" dir.

Fixes #408

Signed-off-by: Fabio Utzig <utzig@apache.org>
This commit is contained in:
Fabio Utzig 2019-09-05 10:57:00 -03:00 committed by Fabio Utzig
parent 7eaaf67bbf
commit 539d7662d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/assemble.py
View File

@ -34,8 +34,8 @@ def same_keys(a, b):
return False return False
return True return True
offset_re = re.compile(r"^#define FLASH_AREA_([0-9A-Z_]+)_OFFSET(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$") offset_re = re.compile(r"^#define DT_FLASH_AREA_([0-9A-Z_]+)_OFFSET(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$")
size_re = re.compile(r"^#define FLASH_AREA_([0-9A-Z_]+)_SIZE(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$") size_re = re.compile(r"^#define DT_FLASH_AREA_([0-9A-Z_]+)_SIZE(_0)?\s+(0x[0-9a-fA-F]+|[0-9]+)$")
class Assembly(): class Assembly():
def __init__(self, output, bootdir): def __init__(self, output, bootdir):
@ -50,7 +50,7 @@ class Assembly():
def find_slots(self, bootdir): def find_slots(self, bootdir):
offsets = {} offsets = {}
sizes = {} sizes = {}
with open(os.path.join(bootdir, 'include', 'generated', 'generated_dts_board.h'), 'r') as fd: with open(os.path.join(bootdir, 'zephyr', 'include', 'generated', 'generated_dts_board_unfixed.h'), 'r') as fd:
for line in fd: for line in fd:
m = offset_re.match(line) m = offset_re.match(line)
if m is not None: if m is not None:
@ -105,7 +105,7 @@ def main():
args = parser.parse_args() args = parser.parse_args()
output = Assembly(args.output, args.bootdir) output = Assembly(args.output, args.bootdir)
output.add_image(os.path.join(args.bootdir, "zephyr.bin"), 'MCUBOOT') output.add_image(os.path.join(args.bootdir, 'zephyr', 'zephyr.bin'), 'MCUBOOT')
output.add_image(args.primary, "IMAGE_0") output.add_image(args.primary, "IMAGE_0")
if args.secondary is not None: if args.secondary is not None:
output.add_image(args.secondary, "IMAGE_1") output.add_image(args.secondary, "IMAGE_1")