Remove last of old hwpf directory

Remove all of the old fapi1 HWPs from P8
Update makefiles/code to not include old hwpf headers

Change-Id: Idc840554721f68b0af3b6ee6c7ad84f5df258e60
RTC: 146345
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28844
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

7 files changed, 9 insertions, 23 deletions

diff --git a/src/usr/htmgt/htmgt.C b/src/usr/htmgt/htmgt.C
index fb23ee008..a7895ee65 100644
--- a/src/usr/htmgt/htmgt.C
+++ b/src/usr/htmgt/htmgt.C
@@ -42,7 +42,7 @@
 #include <targeting/common/targetservice.H>
 
 // HBOCC support
-#include <hwpf/hwp/occ/occ_common.H>
+#include <occ/occ_common.H>
 
 #include <sys/time.h>
 #include <targeting/common/attributeTank.H>
diff --git a/src/usr/htmgt/htmgt_common.mk b/src/usr/htmgt/htmgt_common.mk
index 1be6ad42e..043af9334 100644
--- a/src/usr/htmgt/htmgt_common.mk
+++ b/src/usr/htmgt/htmgt_common.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -24,12 +24,6 @@
 # IBM_PROLOG_END_TAG
 
 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
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_config
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/pstates/pstates
 
 # common objects between hostboot and hbrt
 OBJS += htmgt.o
diff --git a/src/usr/htmgt/htmgt_occ.C b/src/usr/htmgt/htmgt_occ.C
index ee9639dfe..7fd212ac3 100644
--- a/src/usr/htmgt/htmgt_occ.C
+++ b/src/usr/htmgt/htmgt_occ.C
@@ -38,9 +38,9 @@
 #include <console/consoleif.H>
 #include <sys/time.h>
 #include <ecmdDataBufferBase.H>
-#include <hwpf/hwp/occ/occAccess.H>
-#include <hwpf/hwp/occ/occ.H>
-#include <hwpf/hwp/occ/occ_common.H>
+#include <occ/occAccess.H>
+#include <occ/occ.H>
+#include <occ/occ_common.H>
 #include <errl/errludlogregister.H>
 
 namespace HTMGT
diff --git a/src/usr/htmgt/htmgt_occcmd.C b/src/usr/htmgt/htmgt_occcmd.C
index 934cf0ec1..83e950bdc 100644
--- a/src/usr/htmgt/htmgt_occcmd.C
+++ b/src/usr/htmgt/htmgt_occcmd.C
@@ -36,7 +36,7 @@
 #include <targeting/common/targetservice.H>
 
 #include <ecmdDataBufferBase.H>
-#include <hwpf/hwp/occ/occAccess.H>
+#include <occ/occAccess.H>
 
 #include <sys/time.h>
 #include <trace/interface.H>
diff --git a/src/usr/htmgt/makefile b/src/usr/htmgt/makefile
index 81f6b1196..e73d02705 100644
--- a/src/usr/htmgt/makefile
+++ b/src/usr/htmgt/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -25,8 +25,6 @@
 ROOTPATH = ../../..
 MODULE = htmgt
 
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/occ
-
 # objects common to hostboot and hbrt
 include htmgt_common.mk
 
diff --git a/src/usr/htmgt/occError.C b/src/usr/htmgt/occError.C
index 9af585c17..c07dd0be6 100644
--- a/src/usr/htmgt/occError.C
+++ b/src/usr/htmgt/occError.C
@@ -30,7 +30,7 @@
 #include "htmgt_occcmd.H"
 
 #include <ecmdDataBufferBase.H>
-#include <hwpf/hwp/occ/occAccess.H>
+#include <occ/occAccess.H>
 #include <console/consoleif.H>
 #include <targeting/targplatutil.H>
 
diff --git a/src/usr/htmgt/test/makefile b/src/usr/htmgt/test/makefile
index cd03f5636..251c0fe41 100644
--- a/src/usr/htmgt/test/makefile
+++ b/src/usr/htmgt/test/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -24,13 +24,7 @@
 # IBM_PROLOG_END_TAG
 ROOTPATH = ../../../..
 
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/pstates/pstates
 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
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include
-EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_config
 EXTRAINCDIR += ${ROOTPATH}/src/usr/htmgt
 
 MODULE = testhtmgt