This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git
commit 9092e0666a449273b2ea5bacdca64d1a4f55f4e8
Author: Christopher Collins <ccoll...@apache.org>
AuthorDate: Tue Jan 30 12:05:44 2018 -0800
smp_svr - Allow both CONFIG_FCB and CONFIG_FS_NFFS
Prior to this commit, the smp_svr sample app raised a build-time error
if both FCB and NFFS were enabled. The thinking was that a user only
has enough flash space for one or the other. However, this does not
justify an error for two reasons:
1. The user's platform may have sufficient flash for both storage types.
2. Even if only one storage type is enabled, it is still OK to enable
both. One storage type will silently fail to initialize, but the other
will work. Enabling both makes it easier to switch configurations in
the sample app.
---
samples/smp_svr/zephyr/CMakeLists.txt | 4 +---
samples/smp_svr/zephyr/prj.conf | 4 ++--
samples/smp_svr/zephyr/src/main.c | 5 -----
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/samples/smp_svr/zephyr/CMakeLists.txt
b/samples/smp_svr/zephyr/CMakeLists.txt
index ec1fced..b61b8ea 100644
--- a/samples/smp_svr/zephyr/CMakeLists.txt
+++ b/samples/smp_svr/zephyr/CMakeLists.txt
@@ -41,7 +41,5 @@ target_sources(app PRIVATE
zephyr_link_libraries(
MCUMGR
-
- ### Uncomment this line to use the NFFS file system.
- # NFFS
+ NFFS
)
diff --git a/samples/smp_svr/zephyr/prj.conf b/samples/smp_svr/zephyr/prj.conf
index 60ccd65..88ad795 100644
--- a/samples/smp_svr/zephyr/prj.conf
+++ b/samples/smp_svr/zephyr/prj.conf
@@ -17,8 +17,8 @@ CONFIG_MCUMGR_SMP_BT=y
CONFIG_MCUMGR_SMP_SHELL=y
# Enable the NFFS file system.
-#CONFIG_FILE_SYSTEM=y
-#CONFIG_FILE_SYSTEM_NFFS=y
+CONFIG_FILE_SYSTEM=y
+CONFIG_FILE_SYSTEM_NFFS=y
# Enable the flash circular buffer (FCB) for the reboot log.
CONFIG_FLASH_PAGE_LAYOUT=y
diff --git a/samples/smp_svr/zephyr/src/main.c
b/samples/smp_svr/zephyr/src/main.c
index fad6fbc..7f5e9e6 100644
--- a/samples/smp_svr/zephyr/src/main.c
+++ b/samples/smp_svr/zephyr/src/main.c
@@ -17,11 +17,6 @@
#include "mgmt/smp_bt.h"
#include "mgmt/buf.h"
-#if defined CONFIG_FCB && defined CONFIG_FILE_SYSTEM_NFFS
-#error Both CONFIG_FCB and CONFIG_FILE_SYSTEM_NFFS are defined; smp_svr \
- application only supports one at a time.
-#endif
-
#ifdef CONFIG_MCUMGR_CMD_FS_MGMT
#include "fs_mgmt/fs_mgmt.h"
#endif
--
To stop receiving notification emails like this one, please contact
ccoll...@apache.org.
