Require proc-spi-busses.xml to exist for all hardware platforms

Change-Id: Ic9e2933371f0a6121dd15846895afd49907f3afa
RTC: 116310
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15531
Tested-by: Jenkins Server
Reviewed-by: Matt Spinler <spinler@us.ibm.com>
Reviewed-by: Christopher Cain <cjcain@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 1 insertions, 29 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index bfa9fc93c..270c934a9 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -4694,11 +4694,8 @@ my $ridApssBase = 0;
 
 sub init_apss
 {
-    # Not every system currently has a *-proc-spi_busses.xml in the MRW
-    # If no file exists then assume there is no APSS, so just leave @SPIs empty
-    # TODO RTC 116310 revisit the need to allow this file to not exist.
     my $proc_spi_busses =
-                test_mrw_file($::mrwdir, "${sysname}-proc-spi-busses.xml");
+                open_mrw_file($::mrwdir, "${sysname}-proc-spi-busses.xml");
     if($proc_spi_busses ne "")
     {
         my $spiBus = ::parse_xml_file($proc_spi_busses,
@@ -5442,31 +5439,6 @@ sub open_mrw_file
     }
 }
 
-# TODO RTC 116310 Consider removing this once palmetto MRW APSS support
-# is delivered
-sub test_mrw_file
-{
-    my ($paths, $filename) = @_;
-
-    #Need to get list of paths to search
-    my @paths_to_search = split /:/, $paths;
-    my $file_found = "";
-
-    #Check for file at each directory in list
-    foreach my $path (@paths_to_search)
-    {
-        if ( open (FH, "<$path/$filename") )
-        {
-            $file_found = "$path/$filename";
-            close(FH);
-            last; #break out of loop
-        }
-    }
-
-    return $file_found;
-}
-
-
 my %g_xml_cache = ();
 sub parse_xml_file
 {