Removing some more old fapi1 and hwp code

Deleted all of the old fapi1 code
Moved potentially reuseable occ code to a new dir
Deleted a variety of p8 hwp files

Change-Id: I8b6ab72fef3f1413d919bdd21bc88f2c4f59c5c3
RTC: 146345
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23075
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

16 files changed, 0 insertions, 1289 deletions

diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_force_vsafe_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_force_vsafe_errors.xml
deleted file mode 100644
index da10bb66f..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_force_vsafe_errors.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_force_vsafe_errors.xml $   -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_force_vsafe_errors.xml,v 1.7 2014/04/24 17:01:15 daviddu Exp $ -->
-<!-- Error definitions for proc_pmc_force_vsafe procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_VLT_TIMEOUT</rc>
-    <description>Voltage change timeout for the ongoing operation completion.</description>    
-    <ffdc>PSTATETARGET</ffdc>
-    <ffdc>PSTATESTEPTARGET</ffdc>
-    <ffdc>PSTATEACTUAL</ffdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id> 
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>THISCHIP</target>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id> 
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>DCMCHIP</target>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PCBS_PSSTATE_MONITOR_REGISTERS</id>
-      <basedOnPresentChildren>
-          <target>THISCHIP</target>
-          <childType>TARGET_TYPE_EX_CHIPLET</childType>
-          <childPosOffsetMultiplier>0x01000000</childPosOffsetMultiplier>
-      </basedOnPresentChildren>     
-    </collectRegisterFfdc> 
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PCBS_PSSTATE_MONITOR_REGISTERS</id>
-      <basedOnPresentChildren>
-          <target>DCMCHIP</target>
-          <childType>TARGET_TYPE_EX_CHIPLET</childType>
-          <childPosOffsetMultiplier>0x01000000</childPosOffsetMultiplier>
-      </basedOnPresentChildren>     
-    </collectRegisterFfdc>      
-    <callout>
-       <target>THISCHIP</target> 
-       <priority>HIGH</priority> 
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PSTATE_MONITOR_ERR</rc>
-    <description>Voltage change done but expected pstate did not match after completion.</description>
-    <ffdc>THISCHIP</ffdc>
-    <ffdc>PSTATETARGET</ffdc>
-    <ffdc>PSTATESTEPTARGET</ffdc>
-    <ffdc>PSTATEACTUAL</ffdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id>
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>THISCHIP</target>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id>
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>DCMCHIP</target>
-    </collectRegisterFfdc>
-    <callout>
-       <target>THISCHIP</target> 
-       <priority>HIGH</priority> 
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
- <hwpError>
-    <rc>RC_PROCPM_VOLTAGE_CHANGE_MODE_ERR</rc>
-    <description>PMC is disabled for Voltage changes.</description>
-    <ffdc>CHIP</ffdc>
-    <ffdc>PMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
- <!-- *********************************************************************** -->
- <hwpError>
-    <rc>RC_PROCPM_MST_SEQUENCER_STATE_ERR</rc>
-    <description>PMC is disabled PMC_MASTER_SEQUENCER.</description>
-    <ffdc>CHIP</ffdc>
-    <ffdc>PMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_gpe_registers.xml b/src/usr/hwpf/hwp/runtime_errors/p8_gpe_registers.xml
deleted file mode 100644
index 881a3f396..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_gpe_registers.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_gpe_registers.xml $        -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_gpe_registers.xml,v 1.1 2013/10/08 15:45:17 stillgs Exp $ -->
-<!-- Definition of GPE registers to collect on some errors -->
-<hwpErrors>
-  <registerFfdc>
-    <id>REG_FFDC_PROC_GPE_REGISTERS</id>
-    <scomRegister>PORE_GPE0_STATUS_0x00060000</scomRegister>
-    <scomRegister>PORE_GPE0_CONTROL_0x00060001</scomRegister>
-    <scomRegister>PORE_GPE0_RESET_0x00060002</scomRegister>
-    <scomRegister>PORE_GPE0_ERROR_MASK_0x00060003</scomRegister>
-    <scomRegister>PORE_GPE0_PRV_BASE_ADDRESS0_0x00060004</scomRegister>
-    <scomRegister>PORE_GPE0_PRV_BASE_ADDRESS1_0x00060005</scomRegister>
-    <scomRegister>PORE_GPE0_OCI_BASE_ADDRESS0_0x00060006</scomRegister>
-    <scomRegister>PORE_GPE0_OCI_BASE_ADDRESS1_0x00060007</scomRegister>
-    <scomRegister>PORE_GPE0_TABLE_BASE_ADDR_0x00060008</scomRegister>
-    <scomRegister>PORE_GPE0_EXE_TRIGGER_0x00060009</scomRegister>
-    <scomRegister>PORE_GPE0_SCRATCH0_0x0006000A</scomRegister>
-    <scomRegister>PORE_GPE0_SCRATCH1_0x0006000B</scomRegister>
-    <scomRegister>PORE_GPE0_SCRATCH2_0x0006000C</scomRegister>
-    <scomRegister>PORE_GPE0_IBUF_01_0x0006000D</scomRegister>
-    <scomRegister>PORE_GPE0_IBUF_2_0x0006000E</scomRegister>
-    <scomRegister>PORE_GPE0_DBG0_0x0006000F</scomRegister>
-    <scomRegister>PORE_GPE0_DBG1_0x00060010</scomRegister>
-    <scomRegister>PORE_GPE0_PC_STACK0_0x00060011</scomRegister>
-    <scomRegister>PORE_GPE0_PC_STACK1_0x00060012</scomRegister>
-    <scomRegister>PORE_GPE0_PC_STACK2_0x00060013</scomRegister>
-    <scomRegister>PORE_GPE0_ID_FLAGS_0x00060014</scomRegister>
-    <scomRegister>PORE_GPE0_DATA0_0x00060015</scomRegister>
-    <scomRegister>PORE_GPE0_MEMORY_RELOC_0x00060016</scomRegister>  
-    <scomRegister>PORE_GPE1_STATUS_0x00060020</scomRegister>
-    <scomRegister>PORE_GPE1_CONTROL_0x00060021</scomRegister>
-    <scomRegister>PORE_GPE1_RESET_0x00060022</scomRegister>
-    <scomRegister>PORE_GPE1_ERROR_MASK_0x00060023</scomRegister>
-    <scomRegister>PORE_GPE1_PRV_BASE_ADDRESS0_0x00060024</scomRegister>
-    <scomRegister>PORE_GPE1_PRV_BASE_ADDRESS1_0x00060025</scomRegister>
-    <scomRegister>PORE_GPE1_OCI_BASE_ADDRESS0_0x00060026</scomRegister>
-    <scomRegister>PORE_GPE1_OCI_BASE_ADDRESS1_0x00060027</scomRegister>
-    <scomRegister>PORE_GPE1_TABLE_BASE_ADDR_0x00060028</scomRegister>
-    <scomRegister>PORE_GPE1_EXE_TRIGGER_0x00060029</scomRegister>
-    <scomRegister>PORE_GPE1_SCRATCH0_0x0006002A</scomRegister>
-    <scomRegister>PORE_GPE1_SCRATCH1_0x0006002B</scomRegister>
-    <scomRegister>PORE_GPE1_SCRATCH2_0x0006002C</scomRegister>
-    <scomRegister>PORE_GPE1_IBUF_01_0x0006002D</scomRegister>
-    <scomRegister>PORE_GPE1_IBUF_2_0x0006002E</scomRegister>
-    <scomRegister>PORE_GPE1_DBG0_0x0006002F</scomRegister>
-    <scomRegister>PORE_GPE1_DBG1_0x00060030</scomRegister>
-    <scomRegister>PORE_GPE1_PC_STACK0_0x00060031</scomRegister>
-    <scomRegister>PORE_GPE1_PC_STACK1_0x00060032</scomRegister>
-    <scomRegister>PORE_GPE1_PC_STACK2_0x00060033</scomRegister>
-    <scomRegister>PORE_GPE1_ID_FLAGS_0x00060034</scomRegister>
-    <scomRegister>PORE_GPE1_DATA0_0x00060035</scomRegister>
-    <scomRegister>PORE_GPE1_MEMORY_RELOC_0x00060036</scomRegister>    
-  </registerFfdc>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_ocb_init_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_ocb_init_errors.xml
deleted file mode 100644
index ea80f8eaa..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_ocb_init_errors.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_ocb_init_errors.xml $      -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_ocb_init_errors.xml,v 1.3 2013/05/23 18:44:07 stillgs Exp $ -->
-<!-- Error definitions for p8_ocb_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_MODE</rc>
-    <description>Unknown mode passed to p8_ocb_init.</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_Q_LENGTH_PARM</rc>
-    <description>Bad Queue Length Passed to p8_ocb_init.</description>
-  </hwpError>  
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_ITP_TYPE_PARM</rc>
-    <description>Bad Interrupt Type Passed to p8_ocb_init.</description>
-  </hwpError>    
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_Q_OVER_UNDERFLOW_PARM</rc>
-    <description>Bad Queue Over/Underflow Enable Passed to p8_ocb_init.</description>
-  </hwpError>  
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_CHAN_NUM_PARM</rc>
-    <description>Bad Channel Number Passed to p8_ocb_init.</description>
-  </hwpError>    
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_CHAN_TYPE_PARM</rc>
-    <description>Bad Channel Type Passed to p8_ocb_init.</description>
-  </hwpError>    
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCBINIT_BAD_CHAN3_TYPE_PARM</rc>
-    <description>Bad Channel Type for Channel3 Passed to p8_ocb_init.</description>
-  </hwpError>       
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_occ_control_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_occ_control_errors.xml
deleted file mode 100644
index 60972e379..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_occ_control_errors.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_occ_control_errors.xml $   -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_occ_control_errors.xml,v 1.3 2013/08/13 18:15:45 jimyac Exp $ -->
-<!-- Error definitions for p8_occ_control procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCC_CONTROL_BAD_405RESET_PARM</rc>
-    <description>Bad Parm value for i_ppc405_reset_ctrl passed to p8_occ_control.</description>
-    <ffdc>RESET_PARM</ffdc>
-  </hwpError>  
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCC_CONTROL_BAD_405BOOT_PARM</rc>
-    <description>Bad Parm value for i_ppc405_boot_ctrl passed to p8_occ_control.</description>
-    <ffdc>BOOT_PARM</ffdc>
-  </hwpError>    
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_occ_sram_init_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_occ_sram_init_errors.xml
deleted file mode 100644
index 2e77fd35d..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_occ_sram_init_errors.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_occ_sram_init_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_occ_sram_init_errors.xml,v 1.3 2013/08/13 18:15:47 jimyac Exp $ -->
-<!-- Error definitions for p8_occ_sram_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCCSRAM_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to p8_occ_sram_init. </description>
-    <ffdc>MODE</ffdc>
-  </hwpError>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_oha_init_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_oha_init_errors.xml
deleted file mode 100644
index 72ab1c0ee..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_oha_init_errors.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_oha_init_errors.xml $      -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_oha_init_errors.xml,v 1.3 2013/05/23 18:44:14 stillgs Exp $ -->
-<!-- Error definitions for proc_oha_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_OHA_CODE_PUTGETSCOM_FAILED</rc>
-    <description>Register read/write failed in proc_oha_init.</description>
-    <ffdc>ERRORS</ffdc>    
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_OHA_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to proc_oha_init.</description>
-  </hwpError>
-  <!-- *********************************************************************** -->  
-  <hwpError>
-    <rc>RC_PROC_OHA_CODE_BITOP_FAILED</rc>
-    <description>Bit operation failed in proc_oha_init.</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pba_init_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pba_init_errors.xml
deleted file mode 100644
index 6b997e67a..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pba_init_errors.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pba_init_errors.xml $      -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-
-<!-- $Id: p8_pba_init_errors.xml,v 1.7 2014/03/17 23:14:22 stillgs Exp $ -->
-<!-- Error definitions for p8_pba_init procedure -->
-<hwpErrors>
-    <registerFfdc>
-        <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-        <scomRegister>PBA_MODE_0x00064000</scomRegister>
-        <scomRegister>PBA_CONFIG_0x0201084B</scomRegister>
-        <scomRegister>PBA_SLVCTL2_0x00064006</scomRegister>
-        <scomRegister>PBA_SLVCTL0_0x00064004</scomRegister>
-        <scomRegister>PBA_SLVCTL1_0x00064005</scomRegister>
-        <scomRegister>PBA_SLVCTL2_0x00064006</scomRegister>
-        <scomRegister>PBA_SLVCTL3_0x00064007</scomRegister>
-        <scomRegister>PBA_FIR_0x02010840</scomRegister>
-        <scomRegister>PBA_ERR_RPT0_0x0201084C</scomRegister>
-        <scomRegister>PBA_ERR_RPT1_0x0201084D</scomRegister>
-        <scomRegister>PBA_ERR_RPT2_0x0201084E</scomRegister>
-        <scomRegister>PBA_BCDE_CTL_0x00064010</scomRegister>
-        <scomRegister>PBA_BCDE_SET_0x00064011</scomRegister>
-        <scomRegister>PBA_BCDE_STAT_0x00064012</scomRegister>
-        <scomRegister>PBA_BCDE_PBADR_0x00064013</scomRegister>
-        <scomRegister>PBA_BCDE_OCIBAR_0x00064014</scomRegister>
-        <scomRegister>PBA_BCUE_CTL_0x00064015</scomRegister>
-        <scomRegister>PBA_BCUE_SET_0x00064016</scomRegister>
-        <scomRegister>PBA_BCUE_STAT_0x00064017</scomRegister>
-        <scomRegister>PBA_BCUE_PBADR_0x00064018</scomRegister>
-        <scomRegister>PBA_BCUE_OCIBAR_0x00064019</scomRegister>
-        <scomRegister>PBA_PBOCR0_0x00064020</scomRegister>
-        <scomRegister>PBA_PBOCR1_0x00064021</scomRegister>
-        <scomRegister>PBA_PBOCR2_0x00064022</scomRegister>
-        <scomRegister>PBA_PBOCR3_0x00064023</scomRegister>
-        <scomRegister>PBA_PBOCR4_0x00064024</scomRegister>
-        <scomRegister>PBA_BAR0_0x02013F00</scomRegister>
-        <scomRegister>PBA_BARMSK0_0x02013F04</scomRegister>
-        <scomRegister>PBA_BAR1_0x02013F01</scomRegister>
-        <scomRegister>PBA_BARMSK1_0x02013F05</scomRegister>
-        <scomRegister>PBA_BAR2_0x02013F02</scomRegister>
-        <scomRegister>PBA_BARMSK2_0x02013F06</scomRegister>
-        <scomRegister>PBA_BAR3_0x02013F03</scomRegister>
-        <scomRegister>PBA_BARMSK3_0x02013F07</scomRegister>
-        <scomRegister>PBA_TRUSTMODE_0x02013F08</scomRegister>
-    </registerFfdc>
-    <!-- *********************************************************************** -->
-    <hwpError>
-        <rc>RC_PMPROC_PBA_INIT_INCORRECT_MODE</rc>
-        <description>pba init procedure incorrect mode by calling function</description>
-        <ffdc>PM_MODE</ffdc>
-        <callout>
-            <procedure>CODE</procedure>
-            <priority>HIGH</priority>
-        </callout>
-    </hwpError>
-    <!-- *********************************************************************** -->
-    <hwpError>
-        <rc>RC_PMPROC_PBA_SLAVE_RESET_TIMEOUT</rc>
-        <description>pba_init timed out waited for the PBA slave to reset.</description>
-        <ffdc>POLLCOUNT</ffdc>
-        <ffdc>SLAVENUM</ffdc>
-        <ffdc>PBASLVREG</ffdc>
-        <collectRegisterFfdc>
-            <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-            <target>CHIP</target>
-        </collectRegisterFfdc>
-        <callout>
-            <target>CHIP</target>
-            <priority>HIGH</priority>
-        </callout>
-    </hwpError>
-    <!-- *********************************************************************** -->
-    <hwpError>
-        <rc>RC_PMPROC_PBA_SLAVE_BUSY_AFTER_RESET</rc>
-        <description>pba_init detected a busy PBA slave after the slave was reset.</description>
-        <ffdc>POLLCOUNT</ffdc>
-        <ffdc>SLAVENUM</ffdc>
-        <ffdc>PBASLVREG</ffdc>
-        <collectRegisterFfdc>
-            <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-            <target>CHIP</target>
-        </collectRegisterFfdc>
-        <callout>
-            <target>CHIP</target>
-            <priority>HIGH</priority>
-        </callout>
-    </hwpError>
-    <!-- *********************************************************************** -->
-    <hwpError>
-        <rc>RC_PROCPM_PBA_BCDE_STOP_TIMEOUT</rc>
-        <description>pba_init timed out waiting to stop the Block Copy Download Engine.</description>
-        <ffdc>POLLCOUNT</ffdc>
-        <ffdc>POLLVALUE</ffdc>
-        <collectRegisterFfdc>
-            <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-            <target>CHIP</target>
-        </collectRegisterFfdc>
-        <callout>
-            <target>CHIP</target>
-            <priority>HIGH</priority>
-        </callout>
-    </hwpError>
-    <!-- *********************************************************************** -->
-    <hwpError>
-        <rc>RC_PROCPM_PBA_BCUE_STOP_TIMEOUT</rc>
-        <description>pba_init timed out waiting to stop the Block Copy Upload Engine.</description>
-        <ffdc>POLLCOUNT</ffdc>
-        <ffdc>POLLVALUE</ffdc>
-        <collectRegisterFfdc>
-            <id>REG_FFDC_PROC_PBA_REGISTERS</id>
-            <target>CHIP</target>
-        </collectRegisterFfdc>
-        <callout>
-            <target>CHIP</target>
-            <priority>HIGH</priority>
-        </callout>
-    </hwpError>
-    <!-- *********************************************************************** -->
-</hwpErrors>
\ No newline at end of file
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pcbs_init_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pcbs_init_errors.xml
deleted file mode 100644
index fb58ea907..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pcbs_init_errors.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pcbs_init_errors.xml $     -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2012,2014                        -->
-<!-- [+] 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                                                     -->
-<!-- $Id: p8_pcbs_init_errors.xml,v 1.9 2014/10/10 02:01:53 cmolsen Exp $ -->
-<!-- Error definitions for proc_pcbs_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_PCBS_CODE_SAFE_FSM_TIMEOUT</rc>
-    <description>Psafe Pstate and FSM-stable timeout in proc_pcbs_init.</description>
-    <ffdc>LOOPCOUNT</ffdc>
-    <ffdc>PMSR</ffdc>
-    <ffdc>PCBSPM_MON1</ffdc>
-    <ffdc>PCBSPM_MON2</ffdc>
-    <ffdc>PMGP0</ffdc>
-    <ffdc>PMGP1</ffdc>
-    <ffdc>PMERR</ffdc>
-    <ffdc>IVRM_CTRL</ffdc>
-    <ffdc>IVRM_VAL</ffdc>
-    <ffdc>PCBSMODE</ffdc>
-    <callout><target>PROC_CHIP</target><priority>HIGH</priority></callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROC_PCBS_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to proc_pcbs_init.</description>
-    <ffdc>MODE</ffdc>
-  </hwpError>
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml
deleted file mode 100644
index 76209516d..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pm_prep_for_reset_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_pm_prep_for_reset_errors.xml,v 1.6 2013-10-15 17:29:30 dcrowell Exp $ -->
-<!-- Error definitions for p8_pm_prep_for_reset procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PREP_UNSUPPORTED_MODE_ERR</rc>
-    <description>Mode parameter value not supported</description>
-    <ffdc>MODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PREP_TARGET_ERR</rc>
-    <description>Primary target must be set to a valid value in the SCM case.</description>
-    <ffdc>PRIMARY_TARGET</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->  
-</hwpErrors>
-
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pmc_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pmc_errors.xml
deleted file mode 100644
index 1c29b1fbb..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pmc_errors.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pmc_errors.xml $           -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_pmc_errors.xml,v 1.10 2014/03/10 15:04:05 stillgs Exp $ -->
-<!-- Error definitions for proc_pmc_init and proc_pm_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMC_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to proc_pmc_init.</description>
-    <ffdc>MODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCINIT_TIMEOUT</rc>
-    <description>time out in polling some register condition.</description>
-    <callout>
-      <procedure>CHIP_IN_ERROR</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_SPIVID_CONFIG_ERROR</rc>
-    <description>Master target does not have SPIVID ports enabled: check the configuration setup.</description>
-    <ffdc>MASTER_TARGET</ffdc>
-    <ffdc>ATTR_SPIVID_PORT_ENABLE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_SCM_INSTALL_ERROR</rc>
-    <description>Error found in DCM installment attribute settings for the SCM case.</description>
-    <ffdc>MASTER_TARGET</ffdc>
-    <ffdc>SLAVE_TARGET</ffdc>
-    <ffdc>DCM_INSTALLED_1</ffdc>
-    <ffdc>DCM_INSTALLED_2</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_DCM_INSTALL_ERROR</rc>
-    <description>Error found in DCM installment attribute settings.</description>
-    <ffdc>MASTER_TARGET</ffdc>
-    <ffdc>SLAVE_TARGET</ffdc>
-    <ffdc>DCM_INSTALLED_1</ffdc>
-    <ffdc>DCM_INSTALLED_2</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMC_MASTER_CONFIG_ERROR</rc>
-    <description>MasterPMC bit of Master PMC is not set.</description>
-    <ffdc>MASTERPMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMC_SLAVE_CONFIG_ERROR</rc>
-    <description>MasterPMC bit of Slave PMC is not set.</description>
-    <ffdc>SLAVEPMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMC_INTERCHIP_CONFIG_ERROR</rc>
-    <description>Master is enabled with interchip interface but slave is not.</description>
-    <ffdc>MASTERPMCMODE</ffdc>
-    <ffdc>SLAVEPMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMC_FW_MODE_ERROR</rc>
-    <description>Master is enabled with FW pstate mode but slave is not </description>
-    <ffdc>MASTERPMCMODE</ffdc>
-    <ffdc>SLAVEPMCMODE</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_IDLE_ERROR</rc>
-    <description>PMC Idle halt errors exist.  OCC recovery cannot proceed.</description>
-    <ffdc>TARGET</ffdc>
-    <ffdc>PORR</ffdc>
-    <ffdc>PMCSTATUS</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_IDLE_TIMEOUT_ERROR</rc>
-    <description>Timed out in polling for Idle to Halt. OCC recovery cannot proceed </description>
-    <ffdc>TARGET</ffdc>
-    <ffdc>PORR</ffdc>
-    <ffdc>PMCSTATUS</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_SPIVID_TIMEOUT_ERROR</rc>
-    <description>Timed out in polling for SPIVID controller to Halt. OCC reset is suspious but carried out</description>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>TARGET</target>
-    </collectRegisterFfdc>
-    <!-- No callout as this only logs data for use if the PMC reset (part of the OCC reset) actually fails -->
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_INTCHP_TIMEOUT_ERROR</rc>
-    <description>Timed out in polling for InterChip Interface to Halt. OCC reset is suspious but carried out</description>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id>
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>THISTARGET</target>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PSTATE_REGISTERS</id>
-      <id>REG_FFDC_SPIVID_REGISTERS</id>
-      <target>DCMTARGET</target>
-    </collectRegisterFfdc>
-    <!-- No callout as this only logs data for use if the PMC reset (part of the OCC reset) actually fails -->
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCRESET_O2P_TIMEOUT_ERROR</rc>
-    <description>Timed out in polling for OCI to PIB Bridge to Halt. OCC reset is suspious but carried out</description>
-    <ffdc>TARGET</ffdc>
-    <ffdc>O2PSTATUS</ffdc>
-    <!-- No callout as this only logs data for use if the PMC reset (part of the OCC reset) actually fails -->
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCINIT_SCM_INSTALL_ERROR</rc>
-    <description>Error found in DCM installment attribute settings for the SCM case in the PMC INIT phase..</description>
-    <ffdc>MASTER_TARGET</ffdc>
-    <ffdc>SLAVE_TARGET</ffdc>
-    <ffdc>DCM_INSTALLED_1</ffdc>
-    <ffdc>DCM_INSTALLED_2</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PMCINIT_DCM_INSTALL_ERROR</rc>
-    <description>Error found in DCM installment attribute settings in the PMC INIT phase.</description>
-    <ffdc>MASTER_TARGET</ffdc>
-    <ffdc>SLAVE_TARGET</ffdc>
-    <ffdc>DCM_INSTALLED_1</ffdc>
-    <ffdc>DCM_INSTALLED_2</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_poregpe_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_poregpe_errors.xml
deleted file mode 100644
index 2df46ba1c..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_poregpe_errors.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_poregpe_errors.xml $       -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_poregpe_errors.xml,v 1.4 2013-10-15 17:36:07 dcrowell Exp $ -->
-<!-- Error definitions for proc_poregpe procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_GPE_RESET_TIMEOUT</rc>
-    <description>GPE reset failed in proc_poregpe_init.</description>
-    <ffdc>POLLCOUNT</ffdc>
-    <ffdc>MAXPOLLS</ffdc>
-    <ffdc>IENGINE</ffdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_GPE_REGISTERS</id>
-      <target>CHIP</target>
-    </collectRegisterFfdc>
-    <callout>
-      <target>CHIP</target>
-      <priority>HIGH</priority>
-    </callout>  
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_GPE_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to proc_poregpe_init.</description>
-    <ffdc>IMODE</ffdc>
-    <ffdc>CHIP</ffdc>
-    <callout>
-      <procedure>CODE</procedure>      
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_GPE_BAD_ENGINE</rc>
-    <description>Unknown engine passed to proc_poregpe_init. </description>
-    <ffdc>IENGINE</ffdc>
-    <ffdc>CHIP</ffdc>
-    <callout>
-      <procedure>CODE</procedure>      
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pss_errors.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pss_errors.xml
deleted file mode 100644
index 31d53ce64..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pss_errors.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pss_errors.xml $           -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_pss_errors.xml,v 1.6 2013-10-17 19:22:08 dcrowell Exp $ -->
-<!-- Error definitions for proc_pss_init procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PSS_CODE_BAD_MODE</rc>
-    <description>Unknown mode passed to proc_pss_init.</description>
-    <ffdc>IMODE</ffdc>
-    <ffdc>CHIP</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError> 
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PSS_ADC_ERROR</rc>
-    <description>SPIADC error bit asserted waiting for operation to complete.</description>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PSS_REGISTERS</id>
-      <target>CHIP</target>
-    </collectRegisterFfdc>
-    <callout>
-      <target>CHIP</target>
-      <priority>HIGH</priority>
-    </callout>   
-  </hwpError> 
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_PSS_P2S_ERROR</rc>
-    <description>SPIP2S error bit asserted waiting for operation to complete.</description>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_PSS_REGISTERS</id>
-      <target>CHIP</target>
-    </collectRegisterFfdc>
-    <callout>
-      <target>CHIP</target>
-      <priority>HIGH</priority>
-    </callout>   
-  </hwpError> 
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pss_registers.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pss_registers.xml
deleted file mode 100644
index ef8a03a92..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pss_registers.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pss_registers.xml $        -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_pss_registers.xml,v 1.1 2013/10/08 15:45:12 stillgs Exp $ -->
-<!-- Definition of PSS registers to collect on some errors -->
-<hwpErrors>
-  <registerFfdc>
-    <id>REG_FFDC_PROC_PSS_REGISTERS</id>
-    <scomRegister>SPIPSS_ADC_CTRL_REG0_0x00070000</scomRegister>  
-    <scomRegister>SPIPSS_ADC_CTRL_REG1_0x00070001</scomRegister>  
-    <scomRegister>SPIPSS_ADC_CTRL_REG2_0x00070002</scomRegister>  
-    <scomRegister>SPIPSS_ADC_STATUS_REG_0x00070003</scomRegister>  
-    <scomRegister>SPIPSS_ADC_CMD_REG_0x00070004</scomRegister>  
-    <scomRegister>SPIPSS_ADC_WDATA_REG_0x00070010</scomRegister>  
-    <scomRegister>SPIPSS_ADC_RDATA_REG0_0x00070020</scomRegister>  
-    <scomRegister>SPIPSS_ADC_RDATA_REG1_0x00070021</scomRegister>  
-    <scomRegister>SPIPSS_ADC_RDATA_REG2_0x00070022</scomRegister>  
-    <scomRegister>SPIPSS_ADC_RDATA_REG3_0x00070023</scomRegister>  
-    <scomRegister>SPIPSS_100NS_REG_0x00070028</scomRegister>  
-    <scomRegister>SPIPSS_P2S_CTRL_REG0_0x00070040</scomRegister>  
-    <scomRegister>SPIPSS_P2S_CTRL_REG1_0x00070041</scomRegister>  
-    <scomRegister>SPIPSS_P2S_CTRL_REG2_0x00070042</scomRegister>  
-    <scomRegister>SPIPSS_P2S_STATUS_REG_0x00070043</scomRegister>  
-    <scomRegister>SPIPSS_P2S_COMMAND_REG_0x00070044</scomRegister>  
-    <scomRegister>SPIPSS_P2S_WDATA_REG_0x00070050</scomRegister>  
-    <scomRegister>SPIPSS_P2S_RDATA_REG_0x00070060</scomRegister>  
-    <scomRegister>SPIPSS_ADC_RESET_REGISTER_0x00070005</scomRegister>  
-    <scomRegister>SPIPSS_P2S_RESET_REGISTER_0x00070045</scomRegister>  
-  </registerFfdc>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/p8_pstate_registers.xml b/src/usr/hwpf/hwp/runtime_errors/p8_pstate_registers.xml
deleted file mode 100644
index c6ef7a5f7..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/p8_pstate_registers.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/p8_pstate_registers.xml $     -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2014                   -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: p8_pstate_registers.xml,v 1.3 2014/03/05 21:03:14 stillgs Exp $ -->
-<!-- Definition of PMC registers to collect on some errors -->
-<hwpErrors>
-  <registerFfdc>
-    <id>REG_FFDC_PSTATE_REGISTERS</id>
-    <scomRegister>PMC_STATUS_REG_0x00062009</scomRegister>
-    <scomRegister>PMC_LFIR_0x01010840</scomRegister> 
-    <scomRegister>PMC_LFIR_MASK_0x01010843</scomRegister> 
-    <scomRegister>PMC_MODE_REG_0x00062000</scomRegister> 
-    <scomRegister>PMC_PSTATE_MONITOR_AND_CTRL_REG_0x00062002</scomRegister> 
-    <scomRegister>PMC_RAIL_BOUNDS_0x00062003</scomRegister> 
-    <scomRegister>PMC_PARAMETER_REG0_0x00062005</scomRegister> 
-    <scomRegister>PMC_PARAMETER_REG1_0x00062006</scomRegister> 
-    <scomRegister>PMC_EFF_GLOBAL_ACTUAL_VOLTAGE_REG_0x00062007</scomRegister> 
-    <scomRegister>PMC_INTCHP_CTRL_REG1_0x00062010</scomRegister> 
-    <scomRegister>PMC_INTCHP_CTRL_REG4_0x00062012</scomRegister> 
-    <scomRegister>PMC_INTCHP_STATUS_REG_0x00062013</scomRegister> 
-    <scomRegister>PMC_INTCHP_PSTATE_REG_0x00062017</scomRegister> 
-    <scomRegister>PMC_INTCHP_COMMAND_REG_0x00062014</scomRegister> 
-  </registerFfdc>
-  <registerFfdc>
-    <id>REG_FFDC_O2S_REGISTERS</id>
-    <scomRegister>PMC_O2S_CTRL_REG0A_0x00062050</scomRegister>
-    <scomRegister>PMC_O2S_CTRL_REG0B_0x00062051</scomRegister>
-    <scomRegister>PMC_O2S_CTRL_REG1_0x00062052</scomRegister>
-    <scomRegister>PMC_O2S_CTRL_REG2_0x00062053</scomRegister>
-    <scomRegister>PMC_O2S_CTRL_REG4_0x00062055</scomRegister>
-    <scomRegister>PMC_O2S_STATUS_REG_0x00062056</scomRegister>
-    <scomRegister>PMC_O2S_COMMAND_REG_0x00062057</scomRegister>
-    <scomRegister>PMC_O2S_WDATA_REG_0x00062058</scomRegister>
-    <scomRegister>PMC_O2S_RDATA_REG_0x00062059</scomRegister>    
-  </registerFfdc>
-  <registerFfdc>
-    <id>REG_FFDC_SPIVID_REGISTERS</id>
-    <scomRegister>PMC_SPIV_CTRL_REG0A_0x00062040</scomRegister> 
-    <scomRegister>PMC_SPIV_CTRL_REG0B_0x00062041</scomRegister> 
-    <scomRegister>PMC_SPIV_CTRL_REG1_0x00062042</scomRegister>  
-    <scomRegister>PMC_SPIV_CTRL_REG2_0x00062043</scomRegister>  
-    <scomRegister>PMC_SPIV_CTRL_REG3_0x00062044</scomRegister>  
-    <scomRegister>PMC_SPIV_CTRL_REG4_0x00062045</scomRegister>  
-    <scomRegister>PMC_SPIV_STATUS_REG_0x00062046</scomRegister> 
-    <scomRegister>PMC_SPIV_COMMAND_REG_0x00062047</scomRegister>
-  </registerFfdc>
-  <registerFfdc>
-    <id>REG_FFDC_PCBS_PSSTATE_REGISTERS</id> 
-    <scomRegister>EX_DPLL_CPM_PARM_REG_0x100F0152</scomRegister>
-    <scomRegister>EX_PCBS_POWER_MANAGEMENT_STATUS_REG_0x100F0153</scomRegister>
-    <scomRegister>EX_PCBS_iVRM_Control_Status_Reg_0x100F0154</scomRegister>
-    <scomRegister>EX_PCBS_iVRM_Value_Setting_Reg_0x100F0155</scomRegister>
-    <scomRegister>EX_PCBSPM_MODE_REG_0x100F0156</scomRegister>
-    <scomRegister>EX_PCBS_iVRM_PFETSTR_Sense_Reg_0x100F0157</scomRegister>
-    <scomRegister>EX_PCBS_Power_Management_Idle_Control_Reg_0x100F0158</scomRegister>
-    <scomRegister>EX_PCBS_Power_Management_Control_Reg_0x100F0159</scomRegister>
-    <scomRegister>EX_PCBS_PMC_VF_CTRL_REG_0x100F015A</scomRegister>
-    <scomRegister>EX_PCBS_UNDERVOLTING_REG_0x100F015B</scomRegister>
-    <scomRegister>EX_PCBS_Pstate_Index_Bound_Reg_0x100F015C</scomRegister>
-    <scomRegister>EX_PCBS_Power_Management_Bounds_Reg_0x100F015D</scomRegister>
-    <scomRegister>EX_PCBS_PSTATE_TABLE_CTRL_REG_0x100F015E</scomRegister>
-    <scomRegister>EX_PCBS_PSTATE_TABLE_REG_0x100F015F</scomRegister>
-    <scomRegister>EX_PCBS_Pstate_Step_Target_Register_0x100F0160</scomRegister>
-    <scomRegister>EX_PCBS_iVRM_VID_Control_Reg0_0x100F0162</scomRegister>
-    <scomRegister>EX_PCBS_DPLL_STATUS_REG_100F0161</scomRegister>
-    <scomRegister>EX_PCBS_iVRM_VID_Control_Reg1_0x100F0163</scomRegister>
-    <scomRegister>EX_PCBS_Resonant_Clock_Control_Reg0_0x100F0165</scomRegister>
-    <scomRegister>EX_PCBS_Resonant_Clock_Control_Reg1_0x100F0166</scomRegister>
-    <scomRegister>EX_PCBS_Resonant_Clock_Status_Reg_0x100F0167</scomRegister>
-    <scomRegister>EX_PCBS_FSM_MONITOR1_REG_0x100F0170</scomRegister>
-    <scomRegister>EX_PCBS_FSM_MONITOR2_REG_0x100F0171</scomRegister>
-  </registerFfdc>
-  <registerFfdc>
-    <id>REG_FFDC_PCBS_PSSTATE_MONITOR_REGISTERS</id> 
-    <scomRegister>EX_DPLL_CPM_PARM_REG_0x100F0152</scomRegister>
-    <scomRegister>EX_PCBS_PMC_VF_CTRL_REG_0x100F015A</scomRegister>
-    <scomRegister>EX_PCBS_FSM_MONITOR1_REG_0x100F0170</scomRegister>
-    <scomRegister>EX_PCBS_FSM_MONITOR2_REG_0x100F0171</scomRegister>
-  </registerFfdc>
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml b/src/usr/hwpf/hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml
deleted file mode 100644
index 82ad73c7c..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/proc_cpu_special_wakeup_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2012,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- $Id: proc_cpu_special_wakeup_errors.xml,v 1.9 2014/03/10 21:36:58 stillgs Exp $ -->
-<!-- Error definitions for proc_cpu_special_wakeup procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_TIMEOUT</rc>
-    <description>Special wakeup to all EX chiplets timed out.</description>
-    <ffdc>I_OPERATION</ffdc>
-    <ffdc>EX</ffdc>
-    <ffdc>ENTITY</ffdc>
-    <ffdc>POLLCOUNT</ffdc>
-    <ffdc>PMGP0</ffdc>
-    <ffdc>SP_WKUP_REG_ADDRESS</ffdc>
-    <ffdc>SP_WKUP_REG_VALUE</ffdc>
-    <ffdc>HISTORY_ADDRESS</ffdc>
-    <ffdc>HISTORY_VALUE</ffdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_SLW_PCBS_REGISTERS</id>
-      <target>EX_IN_ERROR</target>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_PROC_SLW_REGISTERS</id>
-      <id>REG_FFDC_PROC_SLW_FIR_REGISTERS</id>
-      <id>REG_FFDC_PROC_SLW_PMC_REGISTERS</id>
-      <id>REG_FFDC_PROC_SLW_PBA_REGISTERS</id>
-      <target>CHIP</target>
-    </collectRegisterFfdc>
-    <callout>
-      <target>EX_IN_ERROR</target>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_CODE_BAD_ENTITY</rc>
-    <description>An invalid entity (eg besides FSP, OCC, or PHYP ENUM) was passed to proc_cpu_special_wakeup</description>
-     <ffdc>I_ENTITY</ffdc>
-     <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_CODE_BAD_OP</rc>
-    <description>An invalid operation (eg besides Set or Clear ENUM) was passed to proc_cpu_special_wakeup</description>
-   <ffdc>I_OPERATION</ffdc>
-   <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_CHKSTOP</rc>
-    <description>Special_wakeup requested with the system checkstopped and ATTR_PM_SPWUP_IGNORE_XSTOP_FLAG not set</description>
-    <ffdc>PCBSINTRTYPE</ffdc>
-    <ffdc>ATTRIGNOREXSTOP</ffdc>
-    <ffdc>EX_TARGET</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_SLW_IN_CHKSTOP</rc>
-    <description>Special_wakeup requested to an EX chiplet in either Sleep or Winkle with the system checkstopped
-    Calling firmware will have to check for this return code to influence dump flow.  Note:  this is NOT a loggable error.
-    </description>
-    <ffdc>EX_TARGET</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_NOT_SET</rc>
-    <description>Special wake-up done is not set but a platform COUNT greater than 0 exists.  Hardware and code are out of sync.</description>
-    <ffdc>PMGP0</ffdc>
-    <ffdc>ENTITY_COUNT</ffdc>
-    <ffdc>I_ENTITY</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-    <callout>
-      <target>EX_TARGET</target>
-      <priority>LOW</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_OHA_FLAG_SET_ON_EXIT</rc>
-    <description>Register read/write failed in proc_cpu_special_wakeup</description>
-    <ffdc>I_OPERATION</ffdc>
-    <ffdc>EX</ffdc>
-    <ffdc>ENTITY</ffdc>
-    <ffdc>PHYP_SPCWKUP_COUNT</ffdc>
-    <ffdc>FSP_SPCWKUP_COUNT</ffdc>
-    <ffdc>OCC_SPCWKUP_COUNT</ffdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_SPCWKUP_INVALID_PMHISTORY</rc>
-    <description>Invalid PM History detected in proc_cpu_special_wakeup</description>
-    <ffdc>PMHIST</ffdc>
-    <callout>
-      <target>EX_IN_ERROR</target>
-      <priority>HIGH</priority>
-    </callout>
-  </hwpError>
-  <!-- *********************************************************************** -->
-</hwpErrors>
diff --git a/src/usr/hwpf/hwp/runtime_errors/proc_ocb_indir_access_errors.xml b/src/usr/hwpf/hwp/runtime_errors/proc_ocb_indir_access_errors.xml
deleted file mode 100644
index f402f952d..000000000
--- a/src/usr/hwpf/hwp/runtime_errors/proc_ocb_indir_access_errors.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/usr/hwpf/hwp/runtime_errors/proc_ocb_indir_access_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<!-- Error definitions for proc_ocb_indir_access procedure -->
-<hwpErrors>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_PUT_SCOM</rc>
-    <description>Put to OCB indirect channel failed</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_GET_SCOM</rc>
-    <description>Get from OCB indirect channel failed.</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_LENGTH_CHECK</rc>
-    <description>Input length of data transfered via indirect channel did not match 
-    the output length</description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_CHANNEL</rc>
-    <description>Invalid OCB indirect channel passed to proc_ocb_indir_access. </description>
-  </hwpError>
-  <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_OP</rc>
-    <description>Invalid OCB indirect operation to proc_ocb_indir_access. </description>
-  </hwpError>
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_PUT_DATA_LENGTH_ERROR</rc>
-    <description>No data passed for Put operation. </description>
-  </hwpError> <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_ACCESS_GET_BUFFER</rc>
-    <description>Get of OCB data reg had non-zero response code. </description>
-  </hwpError>
-   <!-- *********************************************************************** -->
-  <hwpError>
-    <rc>RC_PROCPM_OCB_PUT_DATA_POLL_NOT_FULL_ERROR</rc>
-    <description>Indicates that a timeout occured waiting for a push queue to be non-full
-    before writing data.  Is likely due to OCC firmware not pulling entries off of the 
-    queue in a timely manner. </description>
-  </hwpError>
-</hwpErrors>