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

MYNEWT-518 Update comments and design doc.

This commit is contained in:
Christopher Collins 2016-12-21 12:34:17 -08:00
parent 0ff3c6c033
commit 553ba4feb2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot/bootutil/design.txt
View File

@ -203,13 +203,15 @@ purposes; they are not actually present in the boot vector.
| slot-0 | slot-1 | | slot-0 | slot-1 |
-----------------+--------+--------| -----------------+--------+--------|
magic | Any | Good | magic | Any | Good |
image-ok | Any | N/A | image-ok | Any | [*] |
-----------------+--------+--------' -----------------+--------+--------'
pending | | X | pending | | X |
confirmed | X | | confirmed | X | |
-----------------+--------+--------' -----------------+--------+--------+----------------------------'
swap: test | swap: test |
-----------------------------------' note: slot-1 image-ok val indicates whether swap is permanent; |
(0xff=temporary; 0x01=permanent) |
----------------------------------------------------------------'
State III State III
@ -289,6 +291,9 @@ prevent a device from becoming "bricked" by bad firmware. If the device
crashes immediately upon booting the second image, the boot loader reverts to crashes immediately upon booting the second image, the boot loader reverts to
the working image, rather than repeatedly rebooting into the bad image. the working image, rather than repeatedly rebooting into the bad image.
Alternatively, if the user is confident that the alternate image is good, they
can set and confirm in a single action.
The following set of tables illustrate the three possible states that the The following set of tables illustrate the three possible states that the
device can be in: device can be in:

2
boot/bootutil/src/bootutil_misc.c
View File

@ -73,7 +73,7 @@ static const struct boot_swap_table boot_swap_tables[] = {
/* | slot-0 | slot-1 | /* | slot-0 | slot-1 |
*----------+------------+------------| *----------+------------+------------|
* magic | Any | Good | * magic | Any | Good |
* image-ok | Any | N/A | * image-ok | Any | [*] |
* ---------+------------+------------+---------------------------' * ---------+------------+------------+---------------------------'
* swap: test | * swap: test |
* note: slot-1 image-ok val indicates whether swap is permanent; | * note: slot-1 image-ok val indicates whether swap is permanent; |