mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject [1/2] incubator-mynewt-core git commit: No Ticket - Syscfg Reboot log/counter changes
Date Wed, 28 Sep 2016 01:30:22 GMT
Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 1f5baafdb -> 701104676


No Ticket - Syscfg Reboot log/counter changes

- Dependency changes


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/5ddcb8ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5ddcb8ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5ddcb8ea

Branch: refs/heads/develop
Commit: 5ddcb8eadc6c48abba2a304524c6c9ca148bb9d1
Parents: 1f5baaf
Author: Vipul Rahane <vipul@runtime.io>
Authored: Tue Sep 27 18:23:26 2016 -0700
Committer: Vipul Rahane <vipul@runtime.io>
Committed: Tue Sep 27 18:23:26 2016 -0700

----------------------------------------------------------------------
 apps/slinky/pkg.yml    | 9 ++++++++-
 apps/slinky/src/main.c | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5ddcb8ea/apps/slinky/pkg.yml
----------------------------------------------------------------------
diff --git a/apps/slinky/pkg.yml b/apps/slinky/pkg.yml
index 0003fb5..6bbbcdb 100644
--- a/apps/slinky/pkg.yml
+++ b/apps/slinky/pkg.yml
@@ -25,7 +25,6 @@ pkg.homepage: "http://mynewt.apache.org/"
 pkg.keywords:
 
 pkg.deps:
-    - fs/nffs
     - libs/console/full
     - libs/flash_test
     - libs/imgmgr
@@ -40,6 +39,12 @@ pkg.deps:
     - sys/log
     - sys/stats
 
+pkg.deps.CONFIG_NFFS:
+    - fs/nffs
+
+pkg.deps.CONFIG_FCB:
+    - sys/fcb
+
 pkg.syscfg_vals:
     # Enable the shell task.
     SHELL_TASK: 1
@@ -49,3 +54,5 @@ pkg.syscfg_vals:
 
     # Log reboot messages to a flash circular buffer.
     REBOOT_LOG_FCB: 1
+
+    CONFIG_FCB: 1

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5ddcb8ea/apps/slinky/src/main.c
----------------------------------------------------------------------
diff --git a/apps/slinky/src/main.c b/apps/slinky/src/main.c
index 9cb9cdf..bd8808b 100755
--- a/apps/slinky/src/main.c
+++ b/apps/slinky/src/main.c
@@ -75,7 +75,10 @@ static volatile int g_task1_loops;
 static struct os_task task2;
 
 static struct log my_log;
+
+#if MYNEWT_VAL(CONFIG_NFFS)
 extern struct log nffs_log; /* defined in the OS module */
+#endif
 
 static volatile int g_task2_loops;
 
@@ -317,7 +320,10 @@ main(int argc, char **argv)
     cbmem_init(&cbmem, cbmem_buf, MAX_CBMEM_BUF);
     cbmem_init(&nffs_cbmem, nffs_cbmem_buf, MAX_CBMEM_BUF);
     log_register("log", &my_log, &log_cbmem_handler, &cbmem);
+
+#if MYNEWT_VAL(CONFIG_NFFS)
     log_register("nffs", &nffs_log, &log_cbmem_handler, &nffs_cbmem);
+#endif
 
 #if !MYNEWT_VAL(CONFIG_NFFS)
     setup_for_fcb();


Mime
View raw message