Merge pull request #544 from nasa/ic-20200304

Integration Candidate 20200304
nasa · Mar 12, 2020 · 00ec535 · 00ec535
2 parents f1be048 + 69e3b3b
commit 00ec535
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 395 deletions.
diff --git a/cmake/sample_defs/native_osconfig.h b/cmake/sample_defs/native_osconfig.h
@@ -0,0 +1,4 @@
+/* SIMULATION=native specific osconfig options */
+
+/* See parameter description in default_osconfig.h */
+#define OSAL_DEBUG_PERMISSIVE_MODE
diff --git a/fsw/cfe-core/src/es/cfe_es.mak b/fsw/cfe-core/src/es/cfe_es.mak
diff --git a/fsw/cfe-core/src/evs/cfe_evs.mak b/fsw/cfe-core/src/evs/cfe_evs.mak
diff --git a/fsw/cfe-core/src/fs/cfe_fs.mak b/fsw/cfe-core/src/fs/cfe_fs.mak
diff --git a/fsw/cfe-core/src/make/app-rules.mak b/fsw/cfe-core/src/make/app-rules.mak
diff --git a/fsw/cfe-core/src/make/make-rules.mak b/fsw/cfe-core/src/make/make-rules.mak
diff --git a/fsw/cfe-core/src/make/table-rules.mak b/fsw/cfe-core/src/make/table-rules.mak
diff --git a/fsw/cfe-core/src/sb/cfe_sb.mak b/fsw/cfe-core/src/sb/cfe_sb.mak
diff --git a/fsw/cfe-core/src/tbl/cfe_tbl.mak b/fsw/cfe-core/src/tbl/cfe_tbl.mak