Explorar o código

fwupdate: fix flags matching

H. Peter Anvin %!s(int64=2) %!d(string=hai) anos
pai
achega
7b5981fe5b

+ 1 - 1
esp32/max80/fwupdate.c

@@ -364,7 +364,7 @@ static int fwupdate_process_chunk(spz_stream *spz)
 
 	if (spz->header.vmin > spz->vmatch.vmax ||
 	    spz->header.vmax < spz->vmatch.vmin ||
-	    ((spz->header.vmatch ^ spz->header.vmatch) & spz->header.vmask)) {
+	    ((spz->header.vmatch ^ spz->vmatch.vmatch) & spz->header.vmask)) {
 	    /* Chunk not applicable to this target */
 	    return fwupdate_skip_chunk(spz);
 	}

BIN=BIN
esp32/output/max80.ino.bin


+ 3 - 3
fpga/max80.qpf

@@ -19,15 +19,15 @@
 #
 # Quartus Prime
 # Version 21.1.0 Build 842 10/21/2021 SJ Lite Edition
-# Date created = 00:29:54  September 02, 2022
+# Date created = 01:24:01  September 02, 2022
 #
 # -------------------------------------------------------------------------- #
 
 QUARTUS_VERSION = "21.1"
-DATE = "00:29:54  September 02, 2022"
+DATE = "01:24:01  September 02, 2022"
 
 # Revisions
 
-PROJECT_REVISION = "v2"
 PROJECT_REVISION = "v1"
+PROJECT_REVISION = "v2"
 PROJECT_REVISION = "bypass"

BIN=BIN
fpga/output/bypass.jic


BIN=BIN
fpga/output/max80.fw


BIN=BIN
fpga/output/v1.fw


BIN=BIN
fpga/output/v1.jic


BIN=BIN
fpga/output/v1.rbf.gz


BIN=BIN
fpga/output/v1.rpd.gz


BIN=BIN
fpga/output/v1.sof


BIN=BIN
fpga/output/v1.svf.gz


BIN=BIN
fpga/output/v1.xsvf.gz


BIN=BIN
fpga/output/v2.fw


BIN=BIN
fpga/output/v2.jic


BIN=BIN
fpga/output/v2.rbf.gz


BIN=BIN
fpga/output/v2.rpd.gz


BIN=BIN
fpga/output/v2.sof


BIN=BIN
fpga/output/v2.svf.gz


BIN=BIN
fpga/output/v2.xsvf.gz


+ 1 - 1
rv32/checksum.h

@@ -1,4 +1,4 @@
 #ifndef CHECKSUM_H
 #define CHECKSUM_H
-#define SDRAM_SUM 0x66b2eb69
+#define SDRAM_SUM 0xe2aecb1e
 #endif

+ 1 - 1
rv32/spiflash.c

@@ -681,7 +681,7 @@ static int spiflash_process_chunk(spz_stream *spz)
 
 	if (spz->header.vmin > spz->vmatch.vmax ||
 	    spz->header.vmax < spz->vmatch.vmin ||
-	    ((spz->header.vmatch ^ spz->header.vmatch) & spz->header.vmask)) {
+	    ((spz->header.vmatch ^ spz->vmatch.vmatch) & spz->header.vmask)) {
 	    /* Chunk not applicable to this target */
 	    goto skip;
 	}