diff options
| -rw-r--r-- | src/import/chips/p9/xip/Makefile | 10 | ||||
| -rw-r--r-- | src/import/tools/imageProcs/p9_ipl_build.C | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/import/chips/p9/xip/Makefile b/src/import/chips/p9/xip/Makefile index a337e063..59f125c4 100644 --- a/src/import/chips/p9/xip/Makefile +++ b/src/import/chips/p9/xip/Makefile @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -39,8 +39,6 @@ INCLUDES += -I../../../../hwpf/include/plat/ # ppe: define path varia XIP_FLAGS += -DDEBUG_P9_XIP_IMAGE=1 XIP_FLAGS += -DFAPI2_NO_FFDC -CXX_FLAGS += -std=c++11 - ifdef BINDIR OBJ_DIR = $(BINDIR) else @@ -54,12 +52,6 @@ endif CXX = g++ -CXX_RELEASE = 4.8.2 -CXX_VERSION = $(shell $(CXX) -v 2>&1 | grep "$(CXX_RELEASE)") -ifeq ($(CXX_VERSION),) -$(error wrong compiler version. Use $(CXX_RELEASE) compiler. Try: "scl enable devtoolset-2 bash") -endif - XIP_UTILS = p9_xip_tool # Utility targets diff --git a/src/import/tools/imageProcs/p9_ipl_build.C b/src/import/tools/imageProcs/p9_ipl_build.C index 71babfad..a6b13d40 100644 --- a/src/import/tools/imageProcs/p9_ipl_build.C +++ b/src/import/tools/imageProcs/p9_ipl_build.C @@ -72,7 +72,7 @@ std::string getDDSpecificFileName( const char* i_fn, // create our dd specific file name std::stringstream ss; std::string fn = i_fn; - auto found = fn.find_last_of("/"); + size_t found = fn.find_last_of("/"); ss << CHIP_TYPE << std::hex << i_ddLevel << "." << fn.substr(found + 1); return ss.str(); |
