Merge branch 'bugfix/support_GD25Q64_qio_enable_v3.3' into 'release/v3.3'

donghengqaz · donghengqaz · commit d3517e35f4df · 2019-12-26T11:16:42.000+08:00
bugfix(flash): add support for GD25Q64 qio enable (backport v3.3)

See merge request sdk/ESP8266_RTOS_SDK!1241
diff --git a/components/spi_flash/src/spi_flash.c b/components/spi_flash/src/spi_flash.c
@@ -430,7 +430,7 @@ void user_spi_flash_dio_to_qio_pre_init(void)
             to_qio = true;
         }
         //ENABLE FLASH QIO 0X31H+BIT2
-    } else if (((flash_id & 0xFFFFFF) == 0x1640C8) || ((flash_id & 0xFFFFFF) == 0x1840C8)) {
+    } else if ((flash_id & 0xFFFF) == 0x40C8) {
         if (flash_gd25q32c_enable_QIO_mode() == true) {
             to_qio = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ void user_spi_flash_dio_to_qio_pre_init(void)`
`430`	`430`	`to_qio = true;`
`431`	`431`	`}`
`432`	`432`	`//ENABLE FLASH QIO 0X31H+BIT2`
`433`		`- } else if (((flash_id & 0xFFFFFF) == 0x1640C8) \|\| ((flash_id & 0xFFFFFF) == 0x1840C8)) {`
	`433`	`+ } else if ((flash_id & 0xFFFF) == 0x40C8) {`
`434`	`434`	`if (flash_gd25q32c_enable_QIO_mode() == true) {`
`435`	`435`	`to_qio = true;`
`436`	`436`	`}`