From 08557a089e2140ae350b825b2ae9ac9c4eddb154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 7 Jul 2026 16:23:29 +0200 Subject: [PATCH] hw/arm/msf2-som: Fix spansion-cr2nv value for S25FL128S MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The emcraft-sf2 board set spansion-cr2nv to 1, which the old m25p80 code treated as a byte count. With the dummy cycle to byte conversion fix, CR2V=1 at SPI x1 is 1 bit, not byte-aligned, and triggers an assertion. Use the S25FL128S default of 0x8 (8 cycles = 1 byte at SPI x1), preserving the same runtime behavior. Signed-off-by: Cédric Le Goater Reviewed-by: Bin Meng Tested-by: Philippe Mathieu-Daudé Message-Id: <20d58663-a8d1-41ff-9348-cae4982c30f0@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/msf2-som.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index caf6e7e1ad..1ada1a1361 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -84,7 +84,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) /* Attach SPI flash to SPI0 controller */ spi_bus = qdev_get_child_bus(dev, "spi0"); spi_flash = qdev_new("s25sl12801"); /* Spansion S25FL128SDPBHICO */ - qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1); + qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 0x8); if (dinfo) { qdev_prop_set_drive_err(spi_flash, "drive", blk_by_legacy_dinfo(dinfo), &error_fatal);