aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2014-12-15 11:52:58 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2014-12-15 12:06:05 +1100
commitfef06cd9d86c09dc7053a44eea71ab77f3b9da5d (patch)
treea69e5302be0bc630113a86b25e8c9c66dddeec57 /external
parent27148cd0f998384e2e53e73cf3a001a4a2e794b7 (diff)
downloadskiboot-fef06cd9d86c09dc7053a44eea71ab77f3b9da5d.zip
skiboot-fef06cd9d86c09dc7053a44eea71ab77f3b9da5d.tar.gz
skiboot-fef06cd9d86c09dc7053a44eea71ab77f3b9da5d.tar.bz2
mambo: Get the zImage from an environment variable
Rather than hard coding /tmp/zImage.epapr, get the zImage from an environment variable. This is a) cleaner, and b) allows running multiple copies of the simulator against different kernels simultaneously. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'external')
-rw-r--r--external/mambo/skiboot.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index cc1fc36..4993d18 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -25,7 +25,10 @@ mconfig boot_load MAMBO_BOOT_LOAD 0
mconfig boot_pc MAMBO_BOOT_PC 0x10
# Payload: Allow for a Linux style ramdisk/initrd
-mconfig payload PAYLOAD /tmp/zImage.epapr
+if { ![info exists env(SKIBOOT_ZIMAGE)] } {
+ error "Please set SKIBOOT_ZIMAGE to the path of your zImage.epapr"
+}
+mconfig payload PAYLOAD $env(SKIBOOT_ZIMAGE)
# Paylod: Memory location for a Linux style ramdisk/initrd
mconfig payload_addr PAYLOAD_ADDR 0x20000000;