Pull FSI data from real attributes (Task 3909).

There are a group of attributes defined for FSI now.
-ATTR_FSI_MASTER_CHIP
-ATTR_FSI_MASTER_TYPE
-ATTR_FSI_MASTER_PORT
-ATTR_FSI_SLAVE_CASCADE
-ATTR_FSI_OPTION_FLAGS

Also includes work for Story 3996.  The attributes are now broken
into 3 distinct pieces:
- attribute_types.xml : defines hostboot attributes
- target_types.xml : defines different types of targets
- XXX.system.xml : system-specific information, equivalent to what
                   we'll get from system workbook

These are then used to generic system-specific binaries, currently
for 3 platforms:
- simics_SALERNO_targeting.bin
- simics_VENICE_targeting.bin
- vbu_targeting.bin

Change-Id: I2bf920cc62cceb761ab44a07df433da44249d0e0
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/426
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 34 insertions, 5 deletions

diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index a1838677a..f92ac8bf2 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -114,7 +114,8 @@ export SHELL="/bin/bash"        ##  Needed to fool workon to launch a bash
                                 ##  shell, which autosim expects.
 NOWIN="--nowin"                 ##  remote execution does not have a display
 
-MACHINE="SALERNO"
+MACHINE=${MACHINE:-$DEFAULT_MACHINE}
+export MACHINE
 HBOT_SIMICS_SETUP="/gsa/ausgsa/home/a/n/andrewg/web/public/hostboot/simics/hbot_simics_setup.pl"
 
 ##  jenkins creates a new workspace for every compile.
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 0789fab2d..0d063abcb 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips760/Builds/b0928a_1141.760
+/esw/fips760/Builds/b1007a_1143.760
diff --git a/src/build/simics/post_model_hook.simics b/src/build/simics/post_model_hook.simics
index 976cdf1dd..0455e66f0 100755
--- a/src/build/simics/post_model_hook.simics
+++ b/src/build/simics/post_model_hook.simics
@@ -37,3 +37,4 @@ run-python-file hb-simdebug.py
 phys_mem.load-file ../img/hbicore_extended.bin 0x500690
 phys_mem.load-file ../img/pnor.toc 0x500000
 phys_mem.load-file ../img/targeting.bin 0x57E690
+
diff --git a/src/build/tools/cpfiles.pl b/src/build/tools/cpfiles.pl
index 7121892c1..79c794335 100755
--- a/src/build/tools/cpfiles.pl
+++ b/src/build/tools/cpfiles.pl
@@ -69,7 +69,9 @@ my @files = ("src/build/tools/hb-parsedump.pl",
              "img/hbicore_extended.bin",
              "img/hbicore_test_extended.bin",
              "img/pnor.toc",
-             "img/targeting.bin",
+             "img/simics_SALERNO_targeting.bin",
+             "img/simics_VENICE_targeting.bin",
+             "img/vbu_targeting.bin",
              );
 
 #Directories in base git repository
@@ -128,6 +130,8 @@ my $simicsDir = "";
 my $imgDir = "";
 
 my $sandbox = $ENV{'SANDBOXBASE'};
+my $machine = $ENV{'MACHINE'};
+#print "machine = $machine\n";
 
 if ($inDir ne "")
 {
@@ -260,9 +264,28 @@ foreach (@files)
     {
         print "$command\n";
         `$command`;
+	if( $? != 0 )
+	{
+	    print "ERROR : exiting\n";
+	    exit(-1);
+	}
     }
+
+}
+
+# create a sym-link to the appropriate targeting binary
+print "Linking in simics_".$machine.".targeting.bin\n";
+$command = sprintf("ln -sf %s/simics_%s_targeting.bin %s/targeting.bin", $imgDir, $machine, $imgDir );
+print "$command\n";
+`$command`;
+if( $? != 0 )
+{
+    print "ERROR : exiting\n";
+    exit(-1);
 }
 
+
+
 chdir $cwd;
 #print "cwd: ", getcwd()."\n";
 
diff --git a/src/build/tools/hb b/src/build/tools/hb
index 9b9d51392..2a2f2e930 100755
--- a/src/build/tools/hb
+++ b/src/build/tools/hb
@@ -259,7 +259,7 @@ hb_simsetup()
     mksb -rc ${SANDBOXRC} -dir ${SANDBOXROOT} -back $DRIVER \
          -sb ${SANDBOXNAME} -m ppc
 
-    execute_in_sandbox "start_simics -no_start -machine ${MACHINE:-SALERNO}"
+    execute_in_sandbox "start_simics -no_start -machine ${MACHINE:-$DEFAULT_MACHINE}"
 
     echo "Running workarounds."
     cp ${HOSTBOOTROOT}/src/build/citest/etc/workarounds ${SANDBOXBASE}/src
@@ -291,7 +291,7 @@ hb_startsimics()
     fi
 
     execute_in_sandbox \
-        "start_simics -machine ${MACHINE:-SALERNO} ${SIMICSOPTIONS} $*"
+        "start_simics -machine ${MACHINE:-$DEFAULT_MACHINE} ${SIMICSOPTIONS} $*"
 }
 
 hb_rsync()
@@ -336,6 +336,10 @@ fi
 FIRST_PARAM=$1
 shift
 
+MACHINE=${MACHINE:-$DEFAULT_MACHINE}
+export MACHINE
+echo "Setting up for Machine = $MACHINE"
+
 case ${FIRST_PARAM} in
 workon)
     hb_workon $*