Просмотр исходного кода

flashmax.pl: fix --esponly, clean up some error messages

Actually implement --esponly. Clean up some unnecessary error
messages.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin 1 год назад
Родитель
Сommit
df20d40a2f
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      tools/flashmax.pl

+ 2 - 4
tools/flashmax.pl

@@ -150,8 +150,6 @@ my $esptool;
 
 
 # Try running esptool --help and look for a version string
 # Try running esptool --help and look for a version string
 sub try_esptool($) {
 sub try_esptool($) {
-    use Data::Dump 'pp';
-
     my($cmd) = @_;
     my($cmd) = @_;
 
 
     return undef if ($cmd eq '');
     return undef if ($cmd eq '');
@@ -592,7 +590,7 @@ sub upload_fpgadata($$) {
 	require Win32::SerialPort;
 	require Win32::SerialPort;
 	Win32::SerialPort->import(qw(:STAT));
 	Win32::SerialPort->import(qw(:STAT));
 	'Win32::SerialPort';
 	'Win32::SerialPort';
-    } || die "$0: need Device::SerialPort or Win32::SerialPort\n";
+    } || die "$0: need Device::SerialPort (Unix/MacOS) or Win32::SerialPort (Win32)\n";
 
 
     print STDERR "Waiting for reinit...\n";
     print STDERR "Waiting for reinit...\n";
     usleep(4000000);
     usleep(4000000);
@@ -904,7 +902,7 @@ if (scalar(@espfiles)) {
 		'-z', map { (sprintf('0x%x', $_->[0]), $_->[1]) } @espfiles);
 		'-z', map { (sprintf('0x%x', $_->[0]), $_->[1]) } @espfiles);
 }
 }
 
 
-if (defined($fpgadata)) {
+if (!$esponly && defined($fpgadata)) {
     upload_fpgadata($port, $fpgadata);
     upload_fpgadata($port, $fpgadata);
 }
 }