HB runtime OCC support for Sapphire

Change-Id: Ie730f0676fa3e35b030d88da8ce666ee61c413a3
RTC: 76683
Backport: release-fips810
CMVC-Prereq: 922520
CQ: SW256269
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9187
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 118 insertions, 52 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk
new file mode 100644
index 000000000..8c82a329b
--- /dev/null
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk
@@ -0,0 +1,77 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.mk $
+#
+# IBM CONFIDENTIAL
+#
+# COPYRIGHT International Business Machines Corp. 2014
+#
+# p1
+#
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# Origin: 30
+#
+# IBM_PROLOG_END_TAG
+##      support for Targeting and fapi
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+
+## pointer to common HWP files
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
+
+##  NOTE: add the base istep dir here.
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors
+
+##  Include sub dirs
+##  NOTE: add a new EXTRAINCDIR when you add a new HWP
+##  EXAMPLE:
+##  EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ/occ_procedures
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr
+EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils
+
+CFLAGS += -D __FAPI
+
+##  NOTE: add new object files when you add a new HWP
+OBJS += \
+		p8_image_help.o         \
+		p8_scan_compression.o   \
+		pore_inline_assembler.o \
+		p8_pba_bar_config.o     \
+		sbe_xip_image.o         \
+		p8_pore_table_static_data.o   \
+		p8_pore_table_gen_api_fixed.o \
+		p8_pmc_deconfig_setup.o \
+		p8_poreslw_init.o       \
+		p8_set_pore_bar.o       \
+		p8_xip_customize.o      \
+		p8_ring_identification.o  \
+		p8_slw_build_fixed.o      \
+		p8_image_help_base.o    \
+		p8_pfet_init.o          \
+		p8_pfet_control.o       \
+		p8_block_wakeup_intr.o \
+		p8_mailbox_utils.o
+
+##  NOTE: add a new directory onto the vpaths when you add a new HWP
+##  EXAMPLE:
+#   VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr
+VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils
+
diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile
index 778151d15..4d3693c06 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/makefile
+++ b/src/usr/hwpf/hwp/build_winkle_images/makefile
@@ -24,61 +24,14 @@ ROOTPATH = ../../../../..
 
 MODULE = build_winkle_images
 
-##      support for Targeting and fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+SUBDIRS = runtime.d
 
-## pointer to common HWP files
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
+# objects unique to HB IPL
+OBJS =  build_winkle_images.o
 
-##  NOTE: add the base istep dir here.
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors
+# include objs common to HBRT and HB IPL
+include build_winkle_images.mk
 
-##  Include sub dirs
-##  NOTE: add a new EXTRAINCDIR when you add a new HWP
-##  EXAMPLE:
-##  EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ/occ_procedures
-EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils
-
-CFLAGS += -D __FAPI
-
-
-##  NOTE: add new object files when you add a new HWP
-OBJS =  build_winkle_images.o   \
-        p8_image_help.o         \
-        p8_scan_compression.o   \
-        pore_inline_assembler.o \
-        p8_pba_bar_config.o     \
-        sbe_xip_image.o         \
-        p8_pore_table_static_data.o   \
-        p8_pore_table_gen_api_fixed.o \
-        p8_pmc_deconfig_setup.o \
-        p8_poreslw_init.o       \
-        p8_set_pore_bar.o       \
-        p8_xip_customize.o      \
-        p8_ring_identification.o  \
-        p8_slw_build_fixed.o      \
-        p8_image_help_base.o    \
-        p8_pfet_init.o          \
-        p8_pfet_control.o       \
-        p8_block_wakeup_intr.o \
-        p8_mailbox_utils.o
-
-##  NOTE: add a new directory onto the vpaths when you add a new HWP
-##  EXAMPLE:
-#   VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/<HWP_dir>
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_block_wakeup_intr
-VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile b/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile
new file mode 100644
index 000000000..b52011db7
--- /dev/null
+++ b/src/usr/hwpf/hwp/build_winkle_images/runtime/makefile
@@ -0,0 +1,36 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/hwpf/hwp/build_winkle_images/runtime/makefile $
+#
+# IBM CONFIDENTIAL
+#
+# COPYRIGHT International Business Machines Corp. 2012,2014
+#
+# p1
+#
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# Origin: 30
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../../../../..
+
+HOSTBOOT_RUNTIME = 1
+
+MODULE = build_winkle_images_rt
+
+# objects unique to HBRT - currently none
+# OBJS =
+
+# include objs common to HBRT and HB IPL
+include ../build_winkle_images.mk
+
+include ${ROOTPATH}/config.mk
+