1 files changed, 5 insertions, 52 deletions
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