Remove OCC targeting patches

Change-Id: Ifd645f80cd67d86fbec6c9b97cd2866d950ec657
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14470
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 0 insertions, 743 deletions

diff --git a/src/build/citest/etc/patches/attribute_types.patch b/src/build/citest/etc/patches/attribute_types.patch
deleted file mode 100644
index a97e53b86..000000000
--- a/src/build/citest/etc/patches/attribute_types.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-778,1003c778
-<     <attribute>
-<         <id>IOP_LANES_PER_PROC</id>
-<         <description>Number of PCIE lanes per PROC
-<             creator: MRW
-<             consumer: hwsv
-<             firmware notes:
-<             PCIE Lanes per PROC
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_MASK</id>
-<         <description>PCIE Lane Mask
-<             creator: MRW
-<             consumer: 
-<             firmware notes:
-<             PCIE Lane mask
-<             Array index: IOP number (0:1)
-<                          lane set (0:1)
-<         </description>
-<         <simpleType>
-<             <uint16_t>
-<             </uint16_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>semi-non-volatile</persistency>
-<         <readable/>
-<         <writeable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_DSMP_CAPABLE</id>
-<         <description>DSMP capability
-<             creator: platform
-<             consumer:
-<             firmware notes:
-<             DSMP capability
-<             Array index: IOP number (0:1)
-<                          Lane Set (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>2,2</array>
-<             </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL</id>
-<         <description>PCIE IOP reversal configuration
-<             creator: HWSV
-<             consumer:
-<             firmware notes:
-<             PCIE IOP reversal configuration
-<             Array index: IOP number (0:1)
-<                          Lane Index (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>semi-non-volatile</persistency>
-<         <readable/>
-<         <writeable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL_NON_BIFURCATED</id>
-<         <description>PCIE IOP reversal base configuration
-<             creator: MRW
-<             consumer: 
-<             firmware notes:
-<             PCIE IOP reversal base configuration
-<             Array index: IOP number (0:1)
-<                          Lane Index (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_SWAP_NON_BIFURCATED</id>
-<         <description>PCIE IOP swap base configuration
-<             creator: platform
-<             consumer:
-<             firmware notes:
-<             Encoded PCIE IOP swap configuration
-<             Array index: IOP number (0:1)
-<                          Lane Index (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t></uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id>
-<         <description>PCIE Lane Mask base configuration
-<             creator: HWSV
-<             consumer: 
-<             firmware notes:
-<             PCIE Lane mask
-<             Array index: IOP number (0:1)
-<                          Lane Index (0:1)
-<         </description>
-<         <simpleType>
-<             <uint16_t>
-<             </uint16_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<         <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL_BIFURCATED</id>
-<         <description>PCIE IOP Reversal bifurcated configuration
-<             creator: MRW
-<             consumer: 
-<             firmware notes:
-<             PCIE IOP Reversal bifurcated configuration
-<             Array index: IOP number (0:1)
-<                          Lane Set   (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_SWAP_BIFURCATED</id>
-<         <description>PCIE IOP swap bifurcated configuration
-<             creator: MRW
-<             consumer:
-<             firmware notes:
-<             Encoded PCIE IOP swap bifurcated configuration
-<             Array index: IOP number (0:1)
-<                          Lane Set   (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t></uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_MASK_BIFURCATED</id>
-<         <description>PCIE Lane mask bifurcated configuration
-<             creator: MRW
-<             consumer: 
-<             firmware notes:
-<             PCIE Lane mask bifurcated configuration
-<             Array index: IOP number (0:1)
-<                          Lane Set   (0:1)
-<         </description>
-<         <simpleType>
-<             <uint16_t>
-<             </uint16_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_EQUALIZATION</id>
-<         <description>PCIE Lane Equalization values for each PHB
-<             creator: MRW
-<             consumer: HDAT
-<             firmware notes:
-<             PCIE Lane Equalization values for each PHB
-<             Array index: PHBs (0:3)
-<                          Lane Settings (0:31)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>4,32</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IS_SLOT</id>
-<         <description>Whether the end point is a slot or not
-<             creator:MRW
-<             consumer: 
-<             firmware notes:
-<             Whether the end point is a slot or not
-<             1 - Slot, 0 - not a slot
-<             Array index: Iop Number (0:1)
-<                          lane Set   (0:1)
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<             <array>2,2</array>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
----
-> 
-1413,1427d1187
-<     <attribute>
-<         <id>OCC_MASTER_CAPABLE</id>
-<         <description>
-<             This attribute is to determine whether an occ is master capable.
-<             An OCC is master capable if it's parent processor is wired to the
-<             APSS.
-<         </description>
-<         <simpleType>
-<             <uint8_t>
-<             </uint8_t>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <fspOnly/>
-<     </attribute>
-1774,1838d1533
-<     <enumerationType>
-<         <id>CDM_DOMAIN</id>
-<         <description>Enumeration indicating CDM Domain of a target</description>
-<         <enumerator>
-<             <name>NONE</name>
-<             <value>0</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>CPU</name>
-<             <value>1</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>DIMM</name>
-<             <value>2</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>FABRIC</name>
-<             <value>3</value>
-<         </enumerator> 
-<         <enumerator>
-<             <name>MEM</name>
-<             <value>4</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>IO</name>
-<             <value>5</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>NODE</name>
-<             <value>6</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>CLOCK</name>
-<             <value>7</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>PSI</name>
-<             <value>8</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>FSP</name>
-<             <value>9</value>
-<         </enumerator>
-<         <enumerator>
-<             <name>ALL</name>
-<             <value>10</value>
-<         </enumerator>
-<         <default>NONE</default>
-<    </enumerationType>
-< 
-<     <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <description>Indicates the CDM Domain of an applicable target
-<         </description>
-<         <simpleType>
-<             <enumeration>
-<                 <id>CDM_DOMAIN</id>
-<             </enumeration>
-<         </simpleType>
-<         <persistency>non-volatile</persistency>
-<         <readable/>
-<         <hasStringConversion/>
-<         <fspOnly/>
-<     </attribute>
-<     
diff --git a/src/build/citest/etc/patches/genHwsvMrwXml.patch b/src/build/citest/etc/patches/genHwsvMrwXml.patch
deleted file mode 100644
index c621435a7..000000000
--- a/src/build/citest/etc/patches/genHwsvMrwXml.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-68c68,69
-< #                                        xml parsing 
----
-> #                                        xml parsing
-> #         F 938591 dgilbert Sep 25, 2014 Make OCC target type common to HB 
-96,104d96
-< # for SPI connections in the @SPIs array
-< use constant SPI_PROC_PATH_FIELD => 0;
-< use constant SPI_NODE_FIELD => 1;
-< use constant SPI_POS_FIELD  => 2;
-< use constant SPI_ENDPOINT_PATH_FIELD => 3;
-< use constant SPI_APSS_POS_FIELD => 4;
-< use constant SPI_APSS_ORD_FIELD => 5;
-< use constant SPI_APSS_RID_FIELD => 6;
-< 
-1830,1860d1821
-< # Compares two Apss instances based on the node and position #
-< ################################################################################
-< sub byApssNodePos($$)
-< {
-<     my $retVal = -1;
-< 
-<     my $lhsInstance_node = $_[0][SPI_NODE_FIELD];
-<     my $rhsInstance_node = $_[1][SPI_NODE_FIELD];
-<     if(int($lhsInstance_node) eq int($rhsInstance_node))
-<     {
-<          my $lhsInstance_pos = $_[0][SPI_APSS_POS_FIELD];
-<          my $rhsInstance_pos = $_[1][SPI_APSS_POS_FIELD];
-<          if(int($lhsInstance_pos) eq int($rhsInstance_pos))
-<          {
-<                 die "ERROR: Duplicate apss positions: 2 apss with same
-<                     node and position, \
-<                     NODE: $lhsInstance_node POSITION: $lhsInstance_pos\n";
-<          }
-<          elsif(int($lhsInstance_pos) > int($rhsInstance_pos))
-<          {
-<              $retVal = 1;
-<          }
-<     }
-<     elsif(int($lhsInstance_node) > int($rhsInstance_node))
-<     {
-<         $retVal = 1;
-<     }
-<     return $retVal;
-< }
-< 
-< ################################################################################
-1891,1948d1851
-< my @SPIs;
-< my $apssInit = 0;
-< my $getBaseRidApss = 0;
-< my $ridApssBase = 0;
-< 
-< sub init_apss
-< {
-<     my $proc_spi_busses = 
-<                      open_mrw_file($::mrwdir, "${sysname}-proc-spi-busses.xml");
-<     my $spiBus = ::parse_xml_file($proc_spi_busses,
-<                         forcearray=>['processor-spi-bus']);
-< 
-<     # Capture all SPI connections into the @SPIs array
-<     my @rawSPIs;
-<     foreach my $i (@{$spiBus->{'processor-spi-bus'}})
-<     {
-<         if($getBaseRidApss == 0)
-<         {
-<             my $locCode = $i->{endpoint}->{'location-code'};
-<             my @locCodeComp = split( '-', $locCode );
-<             $ridApssBase = (@locCodeComp > 2) ? 0x4900 : 0x800;
-<             $getBaseRidApss = 1;
-<         }
-< 
-<         if ($i->{endpoint}->{'instance-path'} =~ /.*APSS-[0-9]+$/i)
-<         {
-<             my $pos = $i->{endpoint}->{'instance-path'};
-<             while (chop($pos) ne '/') {};
-<             $pos = chop($pos);
-<             push @rawSPIs, [
-<               $i->{processor}->{'instance-path'},
-<               $i->{processor}->{target}->{node},
-<               $i->{processor}->{target}->{position},
-<               $i->{endpoint}->{'instance-path'},
-<               $pos, 0, 0
-<             ];
-<         }
-<     }
-< 
-<     @SPIs = sort byApssNodePos @rawSPIs;
-< 
-<     my $ordinalApss = 0;
-<     my $apssPos = 0;
-<     my $currNode = -1;
-<     for my $i (0 .. $#SPIs)
-<     {
-<         $SPIs[$i][SPI_APSS_ORD_FIELD] = $ordinalApss;
-<         $ordinalApss++;
-<         if($currNode != $SPIs[$i][SPI_NODE_FIELD])
-<         {
-<             $apssPos = 0;
-<             $currNode = $SPIs[$i][SPI_NODE_FIELD];
-<         }
-<         $SPIs[$i][SPI_APSS_RID_FIELD] 
-<             = sprintf("0x%08X", $ridApssBase + (2*$currNode) + $apssPos++);
-<     }
-< }
-< 
-2025a1929
->         fsp_occ=>\&generate_fsp_occ,
-2561d2464
-<     generate_occ($proc, $ordinalId);
-2719,2744c2622
-< my $occInit = 0;
-< my %occList = ();
-< sub occ_init
-< {
-<     my $targets_file = open_mrw_file($::mrwdir, "${sysname}-targets.xml");
-<     my $occTargets = ::parse_xml_file($targets_file);
-< 
-<     #get the OCC details
-<     foreach my $Target (@{$occTargets->{target}})
-<     {
-<         if($Target->{'ecmd-common-name'} eq "occ")
-<         {
-<             my $ipath = $Target->{'instance-path'};
-<             my $node = $Target->{node};
-<             my $position = $Target->{position};
-< 
-<             $occList{$node}{$position} = {
-<                 'node'         => $node,
-<                 'position'     => $position,
-<                 'instancePath' => $ipath,
-<             }
-<         }
-<     }
-< }
-< 
-< sub generate_occ
----
-> sub generate_fsp_occ
-2747c2625
-<     my ($proc, $ordinalId) = @_;
----
->     my ($ordinalId) = @_;
-2749,2781d2626
-<     if ($apssInit == 0)
-<     {
-<         init_apss;
-<         $apssInit = 1;
-<     }
-< 
-<     # RTC: 49574
-<     # The calculations for HUID and ordinal ID are not correct for multi-node
-<     # configurations, since HUID doesn't take into account the node value, and
-<     # the oridinal ID repeats on every node.  Fix these with the multi-node
-<     # story
-<     my $uidstr = sprintf("0x%02X13%04X",${node},$proc);
-<     my $mastercapable = 0;
-< 
-<     for my $spi ( 0 .. $#SPIs )
-<     {
-<         my $ipath = $SPIs[$spi][SPI_ENDPOINT_PATH_FIELD];
-<         if(($SPIs[$spi][SPI_ENDPOINT_PATH_FIELD] =~ /.*APSS-[0-9]+$/i) &&
-<            ($node eq $SPIs[$spi][SPI_NODE_FIELD]) &&
-<            ($proc eq $SPIs[$spi][SPI_POS_FIELD]))
-<         {
-<             $mastercapable = 1;
-<             last;
-<         }
-<     }
-< 
-<     # Get the OCC info
-<     if ($occInit == 0)
-<     {
-<         occ_init;
-<         $occInit = 1;
-<     }
-<     my $mruData = get_mruid($occList{$node}{$proc}->{'instancePath'});
-2784,2811c2629
-< <!-- $SYSNAME n${node}p${proc} OCC units -->
-< 
-< <targetInstance>
-<     <id>sys${sys}node${node}proc${proc}occ0</id>
-<     <type>occ</type>
-<         <attribute><id>HUID</id><default>${uidstr}</default></attribute>
-<         <attribute><id>ORDINAL_ID</id><default>$ordinalId</default></attribute>
-<         <attribute>
-<         <id>PHYS_PATH</id>
-<         <default>physical:sys-$sys/node-$node/proc-$proc/occ-0</default>
-<     </attribute>
-<     <attribute>
-<         <id>MRU_ID</id>
-<         <default>$mruData</default>
-<     </attribute>
-<     <attribute>
-<         <id>AFFINITY_PATH</id>
-<         <default>affinity:sys-$sys/node-$node/proc-$proc/occ-0</default>
-<     </attribute>
-<     <compileAttribute>
-<         <id>INSTANCE_PATH</id>
-<         <default>instance:$occList{$node}{$proc}->{'instancePath'}</default>
-<     </compileAttribute>
-<     <attribute>
-<         <id>OCC_MASTER_CAPABLE</id>
-<         <default>$mastercapable</default>
-<     </attribute>
-< </targetInstance>\n";
----
->     <attribute><id>ORDINAL_ID</id><default>$ordinalId</default></attribute>";
-2912c2730
-<     if ($apssInit == 0)
----
->     if ($::apssInit == 0)
-2914,2915c2732,2733
-<         init_apss;
-<         $apssInit = 1;
----
->         ::init_apss;
->         $::apssInit = 1;
-2918c2736
-<     for my $i ( 0 .. $#SPIs )
----
->     for my $i ( 0 .. $#::SPIs )
-2920c2738
-<         if ($SPIs[$i][SPI_NODE_FIELD] eq $node)
----
->         if ($::SPIs[$i][::SPI_NODE_FIELD] eq $node)
-2923,2926c2741,2744
-<             my $instanceId = $SPIs[$i][SPI_APSS_POS_FIELD];
-<             my $ordinalId = $SPIs[$i][SPI_APSS_ORD_FIELD];
-<             my $ridstr = $SPIs[$i][SPI_APSS_RID_FIELD];
-<             my $ipath = $SPIs[$i][SPI_ENDPOINT_PATH_FIELD];
----
->             my $instanceId = $::SPIs[$i][::SPI_APSS_POS_FIELD];
->             my $ordinalId = $::SPIs[$i][::SPI_APSS_ORD_FIELD];
->             my $ridstr = $::SPIs[$i][::SPI_APSS_RID_FIELD];
->             my $ipath = $::SPIs[$i][::SPI_ENDPOINT_PATH_FIELD];
diff --git a/src/build/citest/etc/patches/target_types.patch b/src/build/citest/etc/patches/target_types.patch
deleted file mode 100644
index 497d730d8..000000000
--- a/src/build/citest/etc/patches/target_types.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-69,89d68
-<     <id>occ</id>
-<     <parent>unit</parent>
-<     <attribute>
-<         <id>TYPE</id>
-<         <default>OCC</default>
-<     </attribute>
-<     <attribute>
-<         <id>MODEL</id>
-<         <default>POWER8</default>
-<     </attribute>
-<     <attribute>
-<         <id>OCC_MASTER_CAPABLE</id>
-<     </attribute>
-<     <attribute><id>DECONFIG_GARDABLE</id><default>0</default></attribute>
-<     <attribute><id>HWAS_STATE_CHANGED_SUBSCRIPTION_MASK</id>
-<         <default>0x00000000</default>
-<     </attribute>
-<     <fspOnly/>
-< </targetType>
-< 
-< <targetType>
-165,168d143
-<         <id>CDM_DOMAIN</id>
-<         <default>CPU</default>
-<     </attribute>
-<     <attribute>
-356,359d330
-<     <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>MEM</default>
-<     </attribute>
-371,374d341
-<         <id>CDM_DOMAIN</id>
-<         <default>NODE</default>
-<     </attribute>
-<     <attribute>
-596a564
-> 
-600,632d567
-<         <id>PROC_PCIE_LANE_MASK</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_MASK_NON_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_MASK_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_SWAP_NON_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_SWAP_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL_NON_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL_BIFURCATED</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IOP_REVERSAL</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_DSMP_CAPABLE</id>        
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_LANE_EQUALIZATION</id>
-<     </attribute>
-<     <attribute>
-<         <id>PROC_PCIE_IS_SLOT</id>
-<     </attribute>
-<     <attribute>
-635,637d569
-<    <attribute>
-<         <id>IOP_LANES_PER_PROC</id>
-<    </attribute>
-643,646d574
-<         <id>IOP_LANES_PER_PROC</id>
-<         <default>24</default>
-<    </attribute>
-<    <attribute>
-659,662d586
-<         <id>IOP_LANES_PER_PROC</id>
-<         <default>32</default>
-<    </attribute>
-<    <attribute>
-702d625
-<  
-734a658
-> 
-881,912d804
-<  
-< <targetTypeExtension>
-<     <id>lcard-dimm</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>DIMM</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>chip-processor-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>FABRIC</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-abus-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>FABRIC</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-xbus-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>FABRIC</default>
-<     </attribute>
-< </targetTypeExtension>
-917,920d808
-<         <id>CDM_DOMAIN</id>
-<         <default>FABRIC</default>
-<     </attribute>
-<     <attribute>
-925,972d812
-< <targetTypeExtension>
-<     <id>unit-pore-power8</id>
-<     <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>FABRIC</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-mbs-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>MEM</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-l4-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>MEM</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-mcs-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>MEM</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-mba-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>MEM</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
-< <targetTypeExtension>
-<     <id>unit-pci-power8</id>
-<      <attribute>
-<         <id>CDM_DOMAIN</id>
-<         <default>IO</default>
-<     </attribute>
-< </targetTypeExtension>
-< 
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 9c0e730b6..6c1e84378 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -50,23 +50,5 @@ grep -v "GFW_P8_HB_UNSECURE_OFFSET" \
 echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \
     $sb/simu/configs/P8_VENICE.config
 
-echo "+++ Patching attribute_types_fsp.xml for HTMGT attribute support."
-mkdir -p $sb/hbfw/fsp/targeting/xmltohb
 
-cp $BACKING_BUILD/src/hbfw/fsp/targeting/xmltohb/attribute_types_fsp.xml \
-   $sb/hbfw/fsp/targeting/xmltohb
-patch $sb/hbfw/fsp/targeting/xmltohb/attribute_types_fsp.xml \
-      ${HOSTBOOTROOT}/src/build/citest/etc/patches/attribute_types.patch
 
-echo "+++ Patching target_types_fsp.xml for HTMGT attribute support."
-cp $BACKING_BUILD/src/hbfw/fsp/targeting/xmltohb/target_types_fsp.xml \
-   $sb/hbfw/fsp/targeting/xmltohb
-patch $sb/hbfw/fsp/targeting/xmltohb/target_types_fsp.xml \
-      ${HOSTBOOTROOT}/src/build/citest/etc/patches/target_types.patch
-
-echo "+++ Patching genHwsvMrwXml_fsp.pm for OCC attribute support"
-
-mkdir -p $sb/mrw/tools
-cp $BACKING_BUILD/src/mrw/tools/genHwsvMrwXml_fsp.pm  $sb/mrw/tools
-patch $sb/mrw/tools/genHwsvMrwXml_fsp.pm \
-      ${HOSTBOOTROOT}/src/build/citest/etc/patches/genHwsvMrwXml.patch