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/06 23:22:51 UTC
incubator-mynewt-core git commit: Always depend on boot/split package.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop f95c125e9 -> cc0344690
Always depend on boot/split package.
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/cc034469
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/cc034469
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/cc034469
Branch: refs/heads/develop
Commit: cc0344690af62b9205480ca968cb9410c2d96306
Parents: f95c125
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Oct 6 16:22:34 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Oct 6 16:22:48 2016 -0700
----------------------------------------------------------------------
apps/slinky/pkg.yml | 2 --
apps/splitty/pkg.yml | 2 --
boot/split/src/split.c | 6 ------
3 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cc034469/apps/slinky/pkg.yml
----------------------------------------------------------------------
diff --git a/apps/slinky/pkg.yml b/apps/slinky/pkg.yml
index 6bac81f..4f1df54 100644
--- a/apps/slinky/pkg.yml
+++ b/apps/slinky/pkg.yml
@@ -38,8 +38,6 @@ pkg.deps:
- sys/id
- sys/log
- sys/stats
-
-pkg.deps.SPLIT_IMAGE:
- boot/split
pkg.deps.CONFIG_NFFS:
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cc034469/apps/splitty/pkg.yml
----------------------------------------------------------------------
diff --git a/apps/splitty/pkg.yml b/apps/splitty/pkg.yml
index 7c15f81..a0e0a6a 100644
--- a/apps/splitty/pkg.yml
+++ b/apps/splitty/pkg.yml
@@ -37,6 +37,4 @@ pkg.deps:
- sys/id
- sys/log
- sys/stats
-
-pkg.deps.SPLIT_IMAGE:
- boot/split
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cc034469/boot/split/src/split.c
----------------------------------------------------------------------
diff --git a/boot/split/src/split.c b/boot/split/src/split.c
index 08e4d6f..548f7ca 100644
--- a/boot/split/src/split.c
+++ b/boot/split/src/split.c
@@ -17,12 +17,6 @@
* under the License.
*/
-#include "syscfg/syscfg.h"
-
-#if !MYNEWT_VAL(SPLIT_IMAGE)
-#error The split package can only be used in split image builds
-#endif
-
#include <assert.h>
#include <bootutil/bootutil_misc.h>
#include <bootutil/image.h>