aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-03-27 15:53:12 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-03-31 15:42:37 +1100
commite8230ae6745ed9653163dd51dd172a4f1137fd75 (patch)
tree76984813037c9b645b8deb60f3e549946c5e4e2c
parent7e28a14b3012ad60241742fa66d68068f27bb24c (diff)
downloadskiboot-e8230ae6745ed9653163dd51dd172a4f1137fd75.zip
skiboot-e8230ae6745ed9653163dd51dd172a4f1137fd75.tar.gz
skiboot-e8230ae6745ed9653163dd51dd172a4f1137fd75.tar.bz2
mambo: Make mambo_utils.tcl optional
Only source mambo_utils.tcl if we can find it. This allows using skiboot.tcl from another directory, which is useful for automated testing. We need to open code the body of "ton" and "c" obviously, in case we didn't find skiboot.tcl. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--external/mambo/skiboot.tcl13
1 files changed, 8 insertions, 5 deletions
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index d32a627..54d3e39 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -81,7 +81,12 @@ source $env(LIB_DIR)/common/epapr.tcl
if {![info exists of::encode_compat]} {
source $env(LIB_DIR)/common/openfirmware_utils.tcl
}
-source mambo_utils.tcl
+
+# Only source mambo_utils.tcl if it exists in the current directory. That
+# allows running mambo in another directory to the one skiboot.tcl is in.
+if { [file exists mambo_utils.tcl] } then {
+ source mambo_utils.tcl
+}
#
# Instanciate xscom
@@ -169,9 +174,7 @@ for { set i 0 } { $i < $mconf(threads) } { incr i } {
mysim mcm 0 cpu 0 thread $i config_on
}
-# Tools
-
# Turbo mode & run
-ton
-c
+mysim mode turbo
+mysim go
exit