commit | 0ccee8741db997341b319f3ad143cecb2dcd8404 | [log] [tgz] |
---|---|---|
author | Evan Gates <evan@gnarbox.com> | Fri Jul 06 08:02:53 2018 -0700 |
committer | Fabio Utzig <utzig@utzig.org> | Tue Jul 10 11:11:52 2018 -0300 |
tree | c099f7450198fbfa2cfa2316a00dbb83b4882bc5 | |
parent | c354e4ac5eaeec0ec5a45180a39f9e2e84ad6f21 [diff] |
fix the offset and size regular expressions in assemble.py Given the example lines: #define FLASH_AREA_MCUBOOT_OFFSET_0 0x0 #define FLASH_AREA_MCUBOOT_OFFSET FLASH_AREA_MCUBOOT_OFFSET_0 Changing OFFSET_0 to OFFSET(_0)? allows the re to possibly match the second line where it would have stopped the match before. This combined with the (0x)? means that the re does match the second line, with the third group being just the F of FLASH_AREA_IMAGE_1_OFFSET_0. The int() function fails because F is not a valid number. This commit makes the matching more precise by 1) matching the 0x when there are hex digits and without the 0x when there are decimal digits and 2) matching until the end of the line. Signed-off-by: Evan Gates <evan@gnarbox.com>
This is mcuboot, version 1.2.0
MCUboot is a secure bootloader for 32-bit MCUs. The goal of MCUboot is to define a common infrastructure for the bootloader, system flash layout on microcontroller systems, and to provide a secure bootloader that enables easy software upgrade.
MCUboot is operating system and hardware independent, and relies on hardware porting layers from the operating system it works with. Currently mcuboot works with both the Apache Mynewt, and Zephyr operating systems, but more ports are planned in the future. RIOT is currently supported as a boot target with a complete port planned.
Instructions for different operating systems can be found here:
The issues being planned and worked on are tracked on Jira. To participate please visit:
https://runtimeco.atlassian.net/projects/MCUB/summary
Information and documentation on the bootloader is stored within the source, and on confluence:
https://runtimeco.atlassian.net/wiki/discover/all-updates
For more information in the source, here are some pointers:
Developers welcome!