Skip to content

Commit 496f74f

Browse files
tomchynordicjm
authored andcommitted
zephyr: Fix BOOT_DOWNGRADE_PREVENTION_CHOICE symbol
The BOOT_DOWNGRADE_PREVENTION_CHOICE choice should not have a child Kconfig symbols defined inside it. Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent cbdfd91 commit 496f74f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

boot/zephyr/Kconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,16 @@ config MCUBOOT_DOWNGRADE_PREVENTION
10401040
only protects against some attacks against version downgrades (for
10411041
example, a JTAG could be used to write an older version).
10421042

1043+
config MCUBOOT_HW_DOWNGRADE_PREVENTION
1044+
bool "HW based downgrade prevention"
1045+
help
1046+
Prevent undesirable/malicious software downgrades. When this option is
1047+
set, any upgrade must have greater or equal security counter value.
1048+
Because of the acceptance of equal values it allows for software
1049+
downgrade to some extent.
1050+
1051+
endchoice
1052+
10431053
config MCUBOOT_DOWNGRADE_PREVENTION_SECURITY_COUNTER
10441054
bool "Use image security counter instead of version number"
10451055
depends on MCUBOOT_DOWNGRADE_PREVENTION
@@ -1051,14 +1061,6 @@ config MCUBOOT_DOWNGRADE_PREVENTION_SECURITY_COUNTER
10511061
Because of the acceptance of equal values it allows for software
10521062
downgrades to some extent.
10531063

1054-
config MCUBOOT_HW_DOWNGRADE_PREVENTION
1055-
bool "HW based downgrade prevention"
1056-
help
1057-
Prevent undesirable/malicious software downgrades. When this option is
1058-
set, any upgrade must have greater or equal security counter value.
1059-
Because of the acceptance of equal values it allows for software
1060-
downgrade to some extent.
1061-
10621064
config MCUBOOT_HW_DOWNGRADE_PREVENTION_COUNTER_LIMITED
10631065
bool "HW based downgrade prevention counter has limited number of updates"
10641066
depends on MCUBOOT_HW_DOWNGRADE_PREVENTION
@@ -1081,8 +1083,6 @@ config MCUBOOT_HW_DOWNGRADE_PREVENTION_LOCK
10811083
This prevents the application from accidental updates of the counter,
10821084
that may invalidate the currently running image.
10831085

1084-
endchoice
1085-
10861086
config MCUBOOT_UUID_VID
10871087
bool "Expect vendor unique identifier in image's TLV"
10881088
help

0 commit comments

Comments
 (0)