spiflash: Enforce chip selection for all test-cases.

diff --git a/decoder/test/spiflash/test.conf b/decoder/test/spiflash/test.conf
index aa417acaac59fb9858f0163bcd83fb83ad91de5f..3b623bb4f31761ef80a747eeeb0abc45bd1b423c 100644 (file)
--- a/decoder/test/spiflash/test.conf
+++ b/decoder/test/spiflash/test.conf
@@ -1,69 +1,71 @@
 test probe_ascii
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=ascii
+       protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_probe.sr
        output spiflash annotation match probe_ascii.output
 
 test probe_hex
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=hex
+       protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_probe.sr
        output spiflash annotation match probe_hex.output
 
 test read_ascii
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=ascii
+       protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_read.sr
        output spiflash annotation match read_ascii.output
 
 test read_hex
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=hex
+       protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_read.sr
        output spiflash annotation match read_hex.output
 
 test write_ascii
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=ascii
+       protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_write.sr
        output spiflash annotation match write_ascii.output
 
 test write_hex
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=hex
+       protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_write.sr
        output spiflash annotation match write_hex.output
 
 test erase_ascii
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=ascii
+       protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_erase.sr
        output spiflash annotation match erase_ascii.output
 
 test erase_hex
        protocol-decoder spi channel cs=0 channel miso=1 channel clk=2 channel mosi=3
-       protocol-decoder spiflash option format=hex
+       protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/mx25l1605d/mx25l1605d_erase.sr
        output spiflash annotation match erase_hex.output
 
+# Note: The chip used here is unknown, but we force MX25L1605D for now.
 test dualioreads_ascii
        protocol-decoder spi channel cs=2 channel miso=1 channel clk=0 channel mosi=3
-       protocol-decoder spiflash option format=ascii
+       protocol-decoder spiflash option format=ascii option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/spiflash_dualio/dualioreads.sr
        output spiflash annotation match dualioreads_ascii.output
 
+# Note: The chip used here is unknown, but we force MX25L1605D for now.
 test dualioreads_hex
        protocol-decoder spi channel cs=2 channel miso=1 channel clk=0 channel mosi=3
-       protocol-decoder spiflash option format=hex
+       protocol-decoder spiflash option format=hex option chip=macronix_mx25l1605d
        stack spi spiflash
        input spi/spiflash_dualio/dualioreads.sr
        output spiflash annotation match dualioreads_hex.output