Browse Source

Merge branch 'main' into sysvars

H. Peter Anvin 1 year ago
parent
commit
2ac68aac29
3 changed files with 4 additions and 4 deletions
  1. 1 1
      Makefile
  2. 1 1
      rv32/abcio.c
  3. 2 2
      tools/flashmax.pl

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@ MAX80_IP  ?= max80.local
 CURL	   = curl
 PERL	   = perl
 PYTHON     = python
-ESPTOOL   ?= esptool.py
+ESPTOOL   ?= esptool
 export ESPTOOL
 
 all clean spotless :

+ 1 - 1
rv32/abcio.c

@@ -194,7 +194,7 @@ void abc_register(struct abc_dev *dev, unsigned int devsel)
 
     irqmask_t irqmask = mask_irq(ABC_IRQ);
 
-    if (!dev->inp_cnt)
+    if (dev && !dev->inp_cnt)
 	dev->inp_data[0] = dev->inp_data_def;
 
     abc_device[devsel] = dev;

+ 2 - 2
tools/flashmax.pl

@@ -9,7 +9,7 @@ use Time::HiRes qw(usleep tv_interval);
 use Digest::CRC qw(crc32);
 use v5.10;			# For "state"
 
-my $esptool = 'esptool.py';
+my $esptool = 'esptool';
 $esptool = $ENV{'ESPTOOL'} || $esptool;
 
 my $esp_retries = 10;
@@ -25,7 +25,7 @@ my %datatypes = (
     'fpgainit'  => 5,		# FPGA bypass (transient) image during update
     'esppart'   => 6,		# ESP32 partition table
     'espsys'    => 7,		# ESP32 boot loader, OTA control partition...
-    'esptool'   => 8,		# esptool.py options for flashing
+    'esptool'   => 8,		# esptool options for flashing
     'boardinfo' => 9		# board_info base address
     );
 my @type;