]> rtime.felk.cvut.cz Git - novaboot.git/commitdiff
Improve detection of U-Boot prompt after tftpboot command
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 22 Jul 2014 09:08:05 +0000 (11:08 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 22 Jul 2014 09:08:05 +0000 (11:08 +0200)
If the uboot prompt contains '#' character, it might not be detected
properly.

novaboot

index c3392fbb28c66ea83996251600b145e3a97cb063..7b203a3a918d023c574e1315dfe9a0c370093260 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1006,8 +1006,8 @@ if (defined $uboot) {
 
        $exp->send("tftp $kern_addr $kbin\n");
        $exp->expect(10,
-                    [qr/#/, sub { exp_continue; }],
-                    $uboot_prompt) || die "Kernel load failed";
+                    [qr/##/, sub { exp_continue; }],
+                    $uboot_prompt) || die "No U-Boot prompt deteceted";
        if (defined $dtb) {
            $dtb_addr = '7f0000';
            $exp->send("tftp $dtb_addr $dtb\n");