diff options
author | Michael Neuling <mikey@neuling.org> | 2016-04-28 13:03:21 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-04-28 13:52:15 +1000 |
commit | 895d8238eb54a2d09388efb7ed9e29094dddd9b0 (patch) | |
tree | 2e0ee1a280e27d2af67e5921f1291a7bcfe3de8d | |
parent | fc0f46956fcd624cfab10ba54dc40f4544e6c27c (diff) | |
download | skiboot-895d8238eb54a2d09388efb7ed9e29094dddd9b0.zip skiboot-895d8238eb54a2d09388efb7ed9e29094dddd9b0.tar.gz skiboot-895d8238eb54a2d09388efb7ed9e29094dddd9b0.tar.bz2 |
mambo: Remove reliance on env(SIMHOST)
The SIMHOST environment variable is not present in all version of
mambo. This removes the reliance on it and instead uses the "display
default_configure" command to find the simulator type.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | external/mambo/skiboot.tcl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl index f0dc028..5c2c2ce 100644 --- a/external/mambo/skiboot.tcl +++ b/external/mambo/skiboot.tcl @@ -62,10 +62,8 @@ mconfig tap_base MAMBO_NET_TAP_BASE 0 # # Create machine config # -if { ! [info exists env(SIMHOST)] } { - set env(SIMHOST) "pegasus" -} -define dup $env(SIMHOST) myconf +set default_config [display default_configure] +define dup $default_config myconf myconf config cpus $mconf(cpus) myconf config processor/number_of_threads $mconf(threads) myconf config memory_size $mconf(memory) @@ -81,7 +79,7 @@ myconf config machine_option/NO_RAM TRUE myconf config machine_option/NO_ROM TRUE # We need to be DD2 or greater on p8 for the HILE HID bit. -if { $env(SIMHOST) == "pegasus" } { +if { $default_config == "PEGASUS" } { myconf config processor/initial/PVR 0x4b0201 } |