You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/11 23:24:10 UTC
incubator-mynewt-core git commit: Additional change required for
previous boot fix.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 2fda2349c -> d908df939
Additional change required for previous boot fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d908df93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d908df93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d908df93
Branch: refs/heads/develop
Commit: d908df93969508f5bcb9580dcbd767431be8fff5
Parents: 2fda234
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Oct 11 16:23:50 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Oct 11 16:23:50 2016 -0700
----------------------------------------------------------------------
mgmt/imgmgr/src/imgmgr_boot.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d908df93/mgmt/imgmgr/src/imgmgr_boot.c
----------------------------------------------------------------------
diff --git a/mgmt/imgmgr/src/imgmgr_boot.c b/mgmt/imgmgr/src/imgmgr_boot.c
index 34f4471..fdbbda6 100644
--- a/mgmt/imgmgr/src/imgmgr_boot.c
+++ b/mgmt/imgmgr/src/imgmgr_boot.c
@@ -67,7 +67,9 @@ imgr_boot2_read(struct mgmt_jbuf *njb)
/* Temporary hack to preserve old behavior. */
if (boot_split_app_active_get()) {
- test_slot = 0;
+ if (boot_split_mode_get() == BOOT_SPLIT_MODE_TEST_APP) {
+ test_slot = 0;
+ }
main_slot = 0;
active_slot = 1;
} else {