[SBE-code-re-org][2] Chip-op handler code

Separate chip-op handler and chip-op table to make
it project specific

Change-Id: I3ff0e83b199172ce0c0fcb49a980a0076ad778a7
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50504
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 17 insertions, 15 deletions

diff --git a/src/build/Makefile b/src/build/Makefile
index 07f7e12b..05081e9e 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -47,14 +47,14 @@ LIB_DIRS += -L$(OBJDIR)/sbefw/coreseeprom
 SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbecoreseeprom/libsbecoreseeprom.a
 LLIBS += -lsbecoreseeprom
 
-SUBDIRS += ../sbefw/app
-LIB_DIRS += -L$(OBJDIR)/sbefw/app
-SBEAPPLIB := $(OBJDIR)/sbefw/app/libsbeapp.a
-LLIBS += -lsbeapp
+SUBDIRS += ../sbefw/app/power
+LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_pibmem
+SBEAPPLIB := $(OBJDIR)/sbefw/app/libsbeapppowerpibmem.a
+LLIBS += -lsbeapppowerpibmem
 
-LIB_DIRS += -L$(OBJDIR)/sbefw/appseeprom
-SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbeappseeprom/libsbeappseeprom.a
-LLIBS += -lsbeappseeprom
+LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_seeprom
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbeappseeprom/libsbeapppowerseeprom.a
+LLIBS += -lsbeapppowerseeprom
 
 # FAPI2 library
 SUBDIRS += $(PLAT_FAPI2_DIR)
@@ -123,8 +123,8 @@ SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.c
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp_cmd.c
 SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/trac_interface.h
 SIMICS_PPETRACEPP_TAR_FILES += $(PK_SRCDIR)/trace/pk_trace.h
-SIMICS_PARSERPLUGINS_TAR_FILES += $(SBECORE_FW_DIR)/plugins/sbeUserDataParser.C
-SIMICS_PARSERPLUGINS_TAR_FILES += $(SBECORE_FW_DIR)/sbeFFDCType.H
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/core/plugins/sbeUserDataParser.C
+SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/core/sbeFFDCType.H
 
 SBE_TOOLS := $(IMG_DIR)/sbe_default_tool
 SBE_IPL_TOOLS := $(IMG_DIR)/p9_ipl_build
@@ -274,7 +274,7 @@ $(SUBDIRS):
 _sbecore_seeprom:
 	$(MAKE) -I $(INCLUDES) -C ../sbefw/core -f MakefileSeeprom
 _sbeapp_seeprom:
-	$(MAKE) -I $(INCLUDES) -C ../sbefw/app -f MakefileSeeprom
+	$(MAKE) -I $(INCLUDES) -C ../sbefw/app/power -f Makefile img_mem=seeprom
 
 
 #Build the SBE XIP Tools
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index 0f5b009d..91717770 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -78,8 +78,8 @@ ifndef SBE_SRC_DIR
 export SBE_SRC_DIR = $(SBE_ROOT_DIR)/src
 endif
 
-ifndef SBECORE_FW_DIR
-export SBECORE_FW_DIR = $(SBE_SRC_DIR)/sbefw/core
+ifndef SBE_FW_DIR
+export SBE_FW_DIR = $(SBE_SRC_DIR)/sbefw
 endif
 
 ifndef BUILD_DIR
@@ -466,7 +466,9 @@ INCLUDES += -I$(PK_SRCDIR)/../include/std
 INCLUDES += -I$(PK_SRCDIR)/kernel
 INCLUDES += -I$(PK_SRCDIR)/ppe
 INCLUDES += -I$(PK_SRCDIR)/ppe42
-INCLUDES += -I$(SBECORE_FW_DIR)
+INCLUDES += -I$(SBE_FW_DIR)
+INCLUDES += -I$(SBE_FW_DIR)/core
+INCLUDES += -I$(SBE_FW_DIR)/app
 INCLUDES += -I$(BOOT_SRCDIR)
 INCLUDES += -I$(BUILDDATA_SRCDIR)
 INCLUDES += -I$(PK_SRCDIR)/trace