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>

1 files changed, 6 insertions, 2 deletions

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 $*