]> rtime.felk.cvut.cz Git - novaboot.git/commitdiff
Do not run --uboot-cmd if it is empty string
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 10 Feb 2015 13:58:38 +0000 (14:58 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 10 Feb 2015 13:58:38 +0000 (14:58 +0100)
novaboot

index 7603aa6e8d9cb661a1db6c7d5591616cbb02b7d3..a7c1b9b97c6a69e906b3b52edafc19ab96a3e221 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1130,8 +1130,8 @@ if (defined $uboot) {
        $exp->expect(5, $uboot_prompt)  || die "U-Boot prompt timeout";
 
     }
-    if (!$variables->{NO_BOOT}) {
-       $uboot_cmd //= $variables->{UBOOT_CMD} // 'bootm $kernel_addr $ramdisk_addr $fdt_addr';
+    $uboot_cmd //= $variables->{UBOOT_CMD} // 'bootm $kernel_addr $ramdisk_addr $fdt_addr';
+    if (!$variables->{NO_BOOT} && $uboot_cmd ne '') {
        $uboot_cmd =~ s/\$kernel_addr/$uboot_addr{kernel}/g;
        $uboot_cmd =~ s/\$ramdisk_addr/$uboot_addr{ramdisk}/g;
        $uboot_cmd =~ s/\$fdt_addr/$uboot_addr{fdt}/g;