diff options
author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2016-09-14 05:21:51 -0500 |
---|---|---|
committer | Santosh S. Puranik <santosh.puranik@in.ibm.com> | 2016-09-16 05:40:18 -0400 |
commit | c731ca00c7494aa48c8eed36179561c36d19220c (patch) | |
tree | 96a882c2393d270dcc222cd895eef33e0822f454 /src/import/hwpf/fapi2 | |
parent | 644e0c111724481bc5fc42d1dddfd17ec4759b8f (diff) | |
download | talos-sbe-c731ca00c7494aa48c8eed36179561c36d19220c.tar.gz talos-sbe-c731ca00c7494aa48c8eed36179561c36d19220c.zip |
Some updates to FAPI files
-- Updates to FAPI headers to get them compiling
directly from the mirror in PPE repo.
Change-Id: Ia64179ff04c550ec0ef1c4ec56018cf199340ecf
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29637
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29639
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Diffstat (limited to 'src/import/hwpf/fapi2')
-rw-r--r-- | src/import/hwpf/fapi2/include/error_info.H | 4 | ||||
-rw-r--r-- | src/import/hwpf/fapi2/include/fapi2_target.H | 6 | ||||
-rw-r--r-- | src/import/hwpf/fapi2/include/ffdc.H | 5 | ||||
-rw-r--r-- | src/import/hwpf/fapi2/include/return_code.H | 5 | ||||
-rw-r--r-- | src/import/hwpf/fapi2/include/utils.H | 6 |
5 files changed, 17 insertions, 9 deletions
diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H index 9f0e0419..387bf70e 100644 --- a/src/import/hwpf/fapi2/include/error_info.H +++ b/src/import/hwpf/fapi2/include/error_info.H @@ -32,7 +32,9 @@ #define FAPI2_ERRORINFO_H_ #include <stdint.h> -#include <memory> +#ifndef __PPE__ + #include <memory> +#endif #include <vector> #include <target.H> #include <error_info_defs.H> diff --git a/src/import/hwpf/fapi2/include/fapi2_target.H b/src/import/hwpf/fapi2/include/fapi2_target.H index b41eb477..6f2c6793 100644 --- a/src/import/hwpf/fapi2/include/fapi2_target.H +++ b/src/import/hwpf/fapi2/include/fapi2_target.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/fapi2_target.H $ */ +/* $Source: src/import/hwpf/fapi2/include/fapi2_target.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -31,7 +31,9 @@ #define __FAPI2_COMMON_TARGET__ #include <stdint.h> -#include <stdlib.h> +#ifndef __PPE__ + #include <stdlib.h> +#endif // __PPE__ #include <vector> #include <target_types.H> #include <target_states.H> diff --git a/src/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H index 82483d54..6fa2e092 100644 --- a/src/import/hwpf/fapi2/include/ffdc.H +++ b/src/import/hwpf/fapi2/include/ffdc.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/ffdc.H $ */ +/* $Source: src/import/hwpf/fapi2/include/ffdc.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -30,6 +30,8 @@ #ifndef FAPI2_FFDC_H_ #define FAPI2_FFDC_H_ +#if !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC) + #include <memory> #include <hwp_return_codes.H> #include <return_code_defs.H> @@ -235,4 +237,5 @@ class FirstFailureData }; } +#endif // !defined (FAPI2_NO_FFDC) && !defined (MINIMUM_FFDC) #endif // FAPI2_FFDC_H_ diff --git a/src/import/hwpf/fapi2/include/return_code.H b/src/import/hwpf/fapi2/include/return_code.H index f5569dc2..5a15da19 100644 --- a/src/import/hwpf/fapi2/include/return_code.H +++ b/src/import/hwpf/fapi2/include/return_code.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/return_code.H $ */ +/* $Source: src/import/hwpf/fapi2/include/return_code.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -31,6 +31,7 @@ #define __FAPI2_RETURN_CODE__ #include <stdint.h> +#include <return_code_defs.H> #ifndef FAPI2_NO_FFDC #include <ffdc.H> @@ -43,7 +44,7 @@ namespace fapi2 /// // Remove the inheritance relationship with FirstFailureData if // the platform doesn't support FFDC. -#ifdef FAPI2_NO_FFDC +#if defined (FAPI2_NO_FFDC) || defined (MINIMUM_FFDC) class ReturnCode #else class ReturnCode : public FirstFailureData<ReturnCode> diff --git a/src/import/hwpf/fapi2/include/utils.H b/src/import/hwpf/fapi2/include/utils.H index e4f5fa09..4f358fe0 100644 --- a/src/import/hwpf/fapi2/include/utils.H +++ b/src/import/hwpf/fapi2/include/utils.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/utils.H $ */ +/* $Source: src/import/hwpf/fapi2/include/utils.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -38,7 +38,7 @@ namespace fapi2 { - +#ifndef __PPE__ /// /// @brief Enable/Disable special wakeup on processor chip core(s) /// @@ -128,7 +128,7 @@ void createPlatLog( fapi2::ReturnCode& io_rc, fapi2::errlSeverity_t i_sev = fapi2::FAPI2_ERRL_SEV_UNRECOVERABLE ); - +#endif // __PPE__ /// /// @brief Delay this thread. Hostboot will use the nanoseconds parameter /// and make a syscall to nanosleep. While in the syscall, the hostboot |