6 files changed, 98 insertions, 169 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 05081e9e..36a773c2 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -39,21 +39,21 @@ SUBDIRS += $(BOOT_SRCDIR)
 SUBDIRS += $(BUILDDATA_SRCDIR)
 
 SUBDIRS += ../sbefw/core
-LIB_DIRS += -L$(OBJDIR)/sbefw/core
-SBECORELIB := $(OBJDIR)/sbefw/core/libsbecore.a
-LLIBS += -lsbecore
+LIB_DIRS += -L$(OBJDIR)/sbefw/core_pibmem
+SBECORELIB := $(OBJDIR)/sbefw/core_pibmem/libsbecorepibmem.a
+LLIBS += -lsbecorepibmem
 
-LIB_DIRS += -L$(OBJDIR)/sbefw/coreseeprom
-SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbecoreseeprom/libsbecoreseeprom.a
+LIB_DIRS += -L$(OBJDIR)/sbefw/core_seeprom
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/core_seeprom/libsbecoreseeprom.a
 LLIBS += -lsbecoreseeprom
 
 SUBDIRS += ../sbefw/app/power
 LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_pibmem
-SBEAPPLIB := $(OBJDIR)/sbefw/app/libsbeapppowerpibmem.a
+SBEAPPLIB := $(OBJDIR)/sbefw/app/power_pibmem/libsbeapppowerpibmem.a
 LLIBS += -lsbeapppowerpibmem
 
 LIB_DIRS += -L$(OBJDIR)/sbefw/app/power_seeprom
-SBECORESEEPROMLIB := $(OBJDIR)/sbefw/sbeappseeprom/libsbeapppowerseeprom.a
+SBECORESEEPROMLIB := $(OBJDIR)/sbefw/app/power_seeprom/libsbeapppowerseeprom.a
 LLIBS += -lsbeapppowerseeprom
 
 # FAPI2 library
@@ -272,7 +272,7 @@ platattr:
 $(SUBDIRS):
 	$(MAKE) -I $(INCLUDES) -C $@ -f Makefile
 _sbecore_seeprom:
-	$(MAKE) -I $(INCLUDES) -C ../sbefw/core -f MakefileSeeprom
+	$(MAKE) -I $(INCLUDES) -C ../sbefw/core -f Makefile img_mem=seeprom
 _sbeapp_seeprom:
 	$(MAKE) -I $(INCLUDES) -C ../sbefw/app/power -f Makefile img_mem=seeprom
 
diff --git a/src/sbefw/core/Makefile b/src/sbefw/core/Makefile
index 3245d86e..ad0c74c9 100644
--- a/src/sbefw/core/Makefile
+++ b/src/sbefw/core/Makefile
@@ -5,7 +5,8 @@
 #
 # OpenPOWER sbe Project
 #
-# Contributors Listed Below - COPYRIGHT 2016,2017
+# Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,15 +24,23 @@
 # IBM_PROLOG_END_TAG
 #export P2P_ENABLE = 1
 
-export SUB_OBJDIR = /sbefw/core
+ifneq ($(img_mem), seeprom)
+export SUB_OBJDIR = /sbefw/core_pibmem
+OBJS = $(addprefix $(OBJDIR)/, $(COREPIBMEM_OBJECTS))
+LIBNAME = libsbecorepibmem
+else
+export SUB_OBJDIR = /sbefw/core_seeprom
+GCC-CFLAGS += -mlongcall
+GCC-DEFS += -D__SBEFW_SEEPROM__=1
+OBJS = $(addprefix $(OBJDIR)/, $(CORESEEPROM_OBJECTS))
+LIBNAME = libsbecoreseeprom
+endif
 
 include img_defs.mk
-include sbecorefiles.mk
-
-OBJS := $(addprefix $(OBJDIR)/, $(SBECORE_OBJECTS))
+include corefiles.mk
 
-libsbecore.a: $(OBJS)
-	$(AR) crs $(OBJDIR)/libsbecore.a $(OBJDIR)/*.o
+$(LIBNAME).a: $(OBJS)
+	$(AR) crs $(OBJDIR)/$(LIBNAME).a $(OBJDIR)/*.o
 
 .PHONY: clean sbecore
 sbecore: $(OBJS)
diff --git a/src/sbefw/core/MakefileSeeprom b/src/sbefw/core/MakefileSeeprom
deleted file mode 100644
index c2ecf874..00000000
--- a/src/sbefw/core/MakefileSeeprom
+++ /dev/null
@@ -1,59 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/sbecore/Makefile $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2016,2017
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-#export P2P_ENABLE = 1
-
-export SUB_OBJDIR = /sbefw/coreseeprom
-
-include img_defs.mk
-include sbecoreseepromfiles.mk
-
-GCC-CFLAGS += -mlongcall
-GCC-DEFS += -D__SBEFW_SEEPROM__=1
-OBJS := $(addprefix $(OBJDIR)/, $(SBECORESEEPROM_OBJECTS))
-
-libsbecoreseeprom.a: $(OBJS)
-	$(AR) crs $(OBJDIR)/libsbecoreseeprom.a $(OBJDIR)/*.o
-
-.PHONY: clean sbecoreseeprom
-sbecoreseeprom: $(OBJS)
-
-$(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-
-#clean the kernel directory first, then the application level clean
-clean:
-	rm -fr $(OBJDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d)
-endif
-
-
-
-
-
diff --git a/src/sbefw/core/corefiles.mk b/src/sbefw/core/corefiles.mk
new file mode 100644
index 00000000..b65f86d5
--- /dev/null
+++ b/src/sbefw/core/corefiles.mk
@@ -0,0 +1,74 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/sbefw/core/corefiles.mk $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2015,2018
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+COREPIBMEM-CPP-SOURCES = sbemain.C
+COREPIBMEM-CPP-SOURCES += sbeirq.C
+COREPIBMEM-CPP-SOURCES += sbecmdreceiver.C
+COREPIBMEM-CPP-SOURCES += sbecmdprocessor.C
+COREPIBMEM-CPP-SOURCES += sbecmdparser.C
+COREPIBMEM-CPP-SOURCES += sbecmdscomaccess.C
+COREPIBMEM-CPP-SOURCES += sbecmdiplcontrol.C
+COREPIBMEM-CPP-SOURCES += pool.C
+COREPIBMEM-CPP-SOURCES += sbecmdgeneric.C
+COREPIBMEM-CPP-SOURCES += sbeFifoMsgUtils.C
+COREPIBMEM-CPP-SOURCES += sbecmdmemaccess.C
+COREPIBMEM-CPP-SOURCES += sbeHostUtils.C
+COREPIBMEM-CPP-SOURCES += sbecmdcntrldmt.C
+COREPIBMEM-CPP-SOURCES += sbecmdsram.C
+COREPIBMEM-CPP-SOURCES += sberegaccess.C
+COREPIBMEM-CPP-SOURCES += sbecmdcntlinst.C
+COREPIBMEM-CPP-SOURCES += sbecmdregaccess.C
+COREPIBMEM-CPP-SOURCES += sbeFFDC.C
+COREPIBMEM-CPP-SOURCES += sbecmdringaccess.C
+COREPIBMEM-CPP-SOURCES += sbescom.C
+COREPIBMEM-CPP-SOURCES += sbecmdmpipl.C
+COREPIBMEM-CPP-SOURCES += sbefapiutil.C
+COREPIBMEM-CPP-SOURCES += sbeutil.C
+COREPIBMEM-CPP-SOURCES += sbecmdtracearray.C
+COREPIBMEM-CPP-SOURCES += sbeTimerSvc.C
+COREPIBMEM-CPP-SOURCES += sbecmdCntrlTimer.C
+COREPIBMEM-CPP-SOURCES += sbeHostMsg.C
+COREPIBMEM-CPP-SOURCES += sbeSpMsg.C
+COREPIBMEM-CPP-SOURCES += sbeglobals.C
+COREPIBMEM-CPP-SOURCES += sbeMemAccessInterface.C
+COREPIBMEM-CPP-SOURCES += sbeSecureMemRegionManager.C
+COREPIBMEM-CPP-SOURCES += sbeSecurity.C
+COREPIBMEM-CPP-SOURCES += chipop_handler.C
+
+COREPIBMEM-C-SOURCES =
+COREPIBMEM-S-SOURCES =
+
+COREPIBMEM_OBJECTS = $(COREPIBMEM-C-SOURCES:.c=.o) $(COREPIBMEM-CPP-SOURCES:.C=.o) $(COREPIBMEM-S-SOURCES:.S=.o)
+
+# seeprom objects
+CORESEEPROM-CPP-SOURCES = sbecmdgeneric.C
+CORESEEPROM-CPP-SOURCES += sbecmdmpipl.C
+CORESEEPROM-CPP-SOURCES += sbecmdmemaccess.C
+CORESEEPROM-CPP-SOURCES += sbeSecureMemRegionManager.C
+CORESEEPROM-CPP-SOURCES += sbecmdiplcontrol.C
+CORESEEPROM-CPP-SOURCES += sbecmdfastarray.C
+
+CORESEEPROM-C-SOURCES =
+CORESEEPROM-S-SOURCES =
+
+CORESEEPROM_OBJECTS = $(CORESEEPROM-C-SOURCES:.c=.o) $(CORESEEPROM-CPP-SOURCES:.C=.o) $(CORESEEPROM-S-SOURCES:.S=.o)
diff --git a/src/sbefw/core/sbecorefiles.mk b/src/sbefw/core/sbecorefiles.mk
deleted file mode 100644
index 104a8fc1..00000000
--- a/src/sbefw/core/sbecorefiles.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/sbefw/core/sbecorefiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2018
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SBECORE-CPP-SOURCES = sbemain.C
-SBECORE-CPP-SOURCES += sbeirq.C
-SBECORE-CPP-SOURCES += sbecmdreceiver.C
-SBECORE-CPP-SOURCES += sbecmdprocessor.C
-SBECORE-CPP-SOURCES += sbecmdscomaccess.C
-SBECORE-CPP-SOURCES += sbecmdiplcontrol.C
-SBECORE-CPP-SOURCES += pool.C
-SBECORE-CPP-SOURCES += sbecmdgeneric.C
-SBECORE-CPP-SOURCES += sbeFifoMsgUtils.C
-SBECORE-CPP-SOURCES += sbecmdmemaccess.C
-SBECORE-CPP-SOURCES += sbeHostUtils.C
-SBECORE-CPP-SOURCES += sbecmdcntrldmt.C
-SBECORE-CPP-SOURCES += sbecmdsram.C
-SBECORE-CPP-SOURCES += sberegaccess.C
-SBECORE-CPP-SOURCES += sbecmdcntlinst.C
-SBECORE-CPP-SOURCES += sbecmdregaccess.C
-SBECORE-CPP-SOURCES += sbeFFDC.C
-SBECORE-CPP-SOURCES += sbecmdringaccess.C
-SBECORE-CPP-SOURCES += sbescom.C
-SBECORE-CPP-SOURCES += sbecmdmpipl.C
-SBECORE-CPP-SOURCES += sbefapiutil.C
-SBECORE-CPP-SOURCES += sbeutil.C
-SBECORE-CPP-SOURCES += sbecmdtracearray.C
-SBECORE-CPP-SOURCES += sbeTimerSvc.C
-SBECORE-CPP-SOURCES += sbecmdCntrlTimer.C
-SBECORE-CPP-SOURCES += sbeHostMsg.C
-SBECORE-CPP-SOURCES += sbeSpMsg.C
-SBECORE-CPP-SOURCES += sbeglobals.C
-SBECORE-CPP-SOURCES += sbeMemAccessInterface.C
-SBECORE-CPP-SOURCES += sbeSecureMemRegionManager.C
-SBECORE-CPP-SOURCES += sbeSecurity.C
-SBECORE-CPP-SOURCES += chipop_handler.C
-
-SBECORE-C-SOURCES =
-SBECORE-S-SOURCES =
-
-SBECORE_OBJECTS = $(SBECORE-C-SOURCES:.c=.o) $(SBECORE-CPP-SOURCES:.C=.o) $(SBECORE-S-SOURCES:.S=.o)
diff --git a/src/sbefw/core/sbecoreseepromfiles.mk b/src/sbefw/core/sbecoreseepromfiles.mk
deleted file mode 100644
index 5c82f5a3..00000000
--- a/src/sbefw/core/sbecoreseepromfiles.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: src/sbefw/core/sbecoreseepromfiles.mk $
-#
-# OpenPOWER sbe Project
-#
-# Contributors Listed Below - COPYRIGHT 2015,2017
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SBECORESEEPROM-CPP-SOURCES = sbecmdgeneric.C
-SBECORESEEPROM-CPP-SOURCES += sbecmdmpipl.C
-SBECORESEEPROM-CPP-SOURCES += sbecmdmemaccess.C
-SBECORESEEPROM-CPP-SOURCES += sbeSecureMemRegionManager.C
-SBECORESEEPROM-CPP-SOURCES += sbecmdiplcontrol.C
-SBECORESEEPROM-CPP-SOURCES += sbecmdfastarray.C
-
-SBECORESEEPROM-C-SOURCES =
-SBECORESEEPROM-S-SOURCES =
-
-SBECORESEEPROM_OBJECTS = $(SBECORESEEPROM-C-SOURCES:.c=.o) $(SBECORESEEPROM-CPP-SOURCES:.C=.o) $(SBECORESEEPROM-S-SOURCES:.S=.o)