From 448d13e7b45a1edf4f290f800427db8a5890b814 Mon Sep 17 00:00:00 2001 From: ladyada Date: Tue, 30 Jan 2018 01:24:28 -0500 Subject: [PATCH] memory type for alt flash fix --- atmel-samd/spi_flash.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/atmel-samd/spi_flash.c b/atmel-samd/spi_flash.c index d74007a836..8b0030b6b7 100644 --- a/atmel-samd/spi_flash.c +++ b/atmel-samd/spi_flash.c @@ -281,7 +281,11 @@ void spi_flash_init(void) { || response[1] == SPI_FLASH_JEDEC_MANUFACTURER_2 #endif ) && - response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE && + (response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE + #ifdef SPI_FLASH_JEDEC_MANUFACTURER_2 + || response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE_2 + #endif + ) && response[3] == SPI_FLASH_JEDEC_CAPACITY) { spi_flash_is_initialised = true; } else {