| Message ID | 1490095933-3713-1-git-send-email-mpe@ellerman.id.au |
|---|---|
| State | Accepted |
| Headers | show |
Michael Ellerman <mpe@ellerman.id.au> writes: > We don't need to explicitly check for the SKIBOOT environment variable, > the existing code that does: > > mconfig boot_image SKIBOOT ../../skiboot.lid > > Will do that for us, using the content of SKIBOOT if it's set, otherwise > falling back to ../../skiboot.lid. > > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > --- > external/mambo/skiboot.tcl | 3 --- > 1 file changed, 3 deletions(-) thanks, merged to master as of 352b096851f773d842c2e7ef909034ca1696a594
diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl index 8ed0257d4f7f..35a8e37b0dd6 100644 --- a/external/mambo/skiboot.tcl +++ b/external/mambo/skiboot.tcl @@ -18,9 +18,6 @@ mconfig stop_on_ill MAMBO_STOP_ON_ILL false # Location of application binary to load mconfig boot_image SKIBOOT ../../skiboot.lid -if { [info exists env(SKIBOOT)] } { - mconfig boot_image SKIBOOT env(SKIBOOT) -} # Boot: Memory location to load boot_image, for binary or vmlinux mconfig boot_load MAMBO_BOOT_LOAD 0x30000000
We don't need to explicitly check for the SKIBOOT environment variable, the existing code that does: mconfig boot_image SKIBOOT ../../skiboot.lid Will do that for us, using the content of SKIBOOT if it's set, otherwise falling back to ../../skiboot.lid. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- external/mambo/skiboot.tcl | 3 --- 1 file changed, 3 deletions(-)