Additional FAPI migration to fapi2

   Remove fapiSystemConfig.H - API is in target.H
   Add hwp_executor/plat_hwp_executor for FAPI_EXEC_HWP
   Migrate fapiAssert as fapi2::Assert

Change-Id: Ic25da30c05509501b03ecbb3ed68247bced2d707
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17652
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>

5 files changed, 13 insertions, 6 deletions

diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H
index 033e1bbdb..cc555b8c7 100644
--- a/src/import/hwpf/fapi2/include/error_info.H
+++ b/src/import/hwpf/fapi2/include/error_info.H
@@ -36,10 +36,12 @@
 #include <vector>
 #include <target.H>
 #include <error_info_defs.H>
-#include <assert.h>
 
 namespace fapi2
 {
+    // forward fapi2::Assert()
+    extern void Assert(bool);
+
     ///
     /// @class ErrorInfoFfdc
     ///
@@ -616,7 +618,7 @@ namespace fapi2
                           const void* const* i_object) const
             {
                 // "unhandled error info type");
-                assert(iv_type < EI_LAST_TYPE);
+                fapi2::Assert(iv_type < EI_LAST_TYPE);
 
                 switch(iv_type)
                 {
diff --git a/src/import/hwpf/fapi2/include/error_info_defs.H b/src/import/hwpf/fapi2/include/error_info_defs.H
index ca899426b..31fc3429c 100644
--- a/src/import/hwpf/fapi2/include/error_info_defs.H
+++ b/src/import/hwpf/fapi2/include/error_info_defs.H
@@ -34,7 +34,6 @@
 #include <stdint.h>
 #include <target.H>
 #include <variable_buffer.H>
-#include <assert.h>
 
 #include <iostream>
 
@@ -242,6 +241,6 @@ namespace fapi2
                         i_thing.getLength<uint8_t>());
     }
 
-}
+};
 
 #endif // FAPI2_ERRORINFO_DEFS_H_
diff --git a/src/import/hwpf/fapi2/include/fapi2.H b/src/import/hwpf/fapi2/include/fapi2.H
index 12a428132..1056811b3 100644
--- a/src/import/hwpf/fapi2/include/fapi2.H
+++ b/src/import/hwpf/fapi2/include/fapi2.H
@@ -17,9 +17,10 @@
 #include <error_scope.H>
 #include <set_sbe_error.H>      // Generated file
 
+#include <hwp_executor.H>
+
 // Block of headers not currently in fapi2
 #ifdef FAPI2_MISSING_HEADERS
-  #include <fapi2SystemConfig.H>
   #include <mvpdAccess.H>
   #include <mbvpdAccess.H>
 #endif
diff --git a/src/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H
index a0cdd6f21..6ebf87ff8 100644
--- a/src/import/hwpf/fapi2/include/ffdc.H
+++ b/src/import/hwpf/fapi2/include/ffdc.H
@@ -33,7 +33,6 @@
 #include <plat_trace.H>
 #include <error_info.H>
 #include <target.H>
-#include <assert.h>
 
 using fapi2::TARGET_TYPE_ALL;
 
diff --git a/src/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H
index 0f10b32ee..0c19b0965 100644
--- a/src/import/hwpf/fapi2/include/utils.H
+++ b/src/import/hwpf/fapi2/include/utils.H
@@ -83,6 +83,12 @@ namespace fapi2
     ///
     ReturnCode delay(uint64_t i_nanoSeconds, uint64_t i_simCycles);
 
+    ///
+    /// @brief Assert a condition, and halt
+    ///
+    /// @param[in] a boolean representing the assertion
+    ///
+    void Assert(bool i_expression);
 };
 
 #endif // FAPI2_UTILS_H_