[mynewt-core] branch master updated (956f870 -> 4a9ecde)

[cc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git.


    from 956f870  lis2dw12: fix self test to match an5038 rev2
     new cc642f2  sys/fault: Remove #include of nonexistent header
     new 4a9ecde  sys/flash_map: Don't replace dflt flash map with 0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 sys/fault/src/fault.c         | 1 -
 sys/flash_map/src/flash_map.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

[mynewt-core] 01/02: sys/fault: Remove #include of nonexistent header

[cc...@apache.org]

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-core.git

commit cc642f27e94d2cbae94e028d0c76bee7eed23759
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed Dec 12 17:09:24 2018 -0800

    sys/fault: Remove #include of nonexistent header
---
 sys/fault/src/fault.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/fault/src/fault.c b/sys/fault/src/fault.c
index 22f28bb..55a40fc 100644
--- a/sys/fault/src/fault.c
+++ b/sys/fault/src/fault.c
@@ -20,7 +20,6 @@
 #include "os/mynewt.h"
 
 #include "modlog/modlog.h"
-#include "data_recorder/faults.h"
 #include "fault/fault.h"
 #include "fault_priv.h"
 

[mynewt-core] 02/02: sys/flash_map: Don't replace dflt flash map with 0

[cc...@apache.org]

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-core.git

commit 4a9ecdeafcd199a84a3f4d95f07400e4b299c86a
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed Dec 12 17:09:43 2018 -0800

    sys/flash_map: Don't replace dflt flash map with 0
    
    If no flash areas were found in the MMR, keep using the hardcoded flash
    map instead of an empty one.
---
 sys/flash_map/src/flash_map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/flash_map/src/flash_map.c b/sys/flash_map/src/flash_map.c
index 1cab37e..98c58d0 100644
--- a/sys/flash_map/src/flash_map.c
+++ b/sys/flash_map/src/flash_map.c
@@ -423,7 +423,7 @@ flash_map_init(void)
      */
     rc = flash_map_read_mfg(sizeof mfg_areas / sizeof mfg_areas[0],
                             mfg_areas, &num_areas);
-    if (rc == 0) {
+    if (rc == 0 && num_areas > 0) {
         flash_map = mfg_areas;
         flash_map_entries = num_areas;
     }