Preparation for storing U-Boot output to local files

[novaboot.git] / novaboot

diff --git a/novaboot b/novaboot
index 66ec9815e6d49d669613046470a82fcef5cd7015..5f2b3ed1ef34ca5a899bc04fb129354a87a551a1 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1099,7 +1099,13 @@ if (defined $uboot) {
        }
        chomp($cmd);
        $exp->send("$cmd\n");
-       $exp->expect($timeout, $uboot_prompt) || die "U-Boot prompt timeout";
+
+       my ($matched_pattern_position, $error,
+           $successfully_matching_string,
+           $before_match, $after_match) =
+               $exp->expect($timeout, $uboot_prompt);
+       die "No U-Boot prompt: $error" if $error;
+       #print "\n>>>>$before_match<<<<\n";
     }
 
     # Load files if there are some load lines in the script
@@ -1402,9 +1408,10 @@ command line. This option can appear multiple times.
 
 =item -b, --bender
 
-Use F<bender> chainloader. Bender scans the PCI bus for PCI serial
-ports and stores the information about them in the BIOS data area for
-use by the kernel.
+Use L<bender|https://github.com/TUD-OS/morbo/blob/master/standalone/bender.c>
+chainloader. Bender scans the PCI bus for PCI serial ports and stores
+the information about them in the BIOS data area for use by the
+kernel.
 
 =item --chainloader=I<chainloader>
 
@@ -2070,7 +2077,8 @@ with the B<--target> command line option.
 
 =item NOVABOOT_BENDER
 
-Defining this variable has the same meaning as B<--bender> option.
+Defining this variable has the same effect as using B<--bender>
+option.
 
 =back