From 93e31747da028da1dbb2feb445deb56c5a9628e1 Mon Sep 17 00:00:00 2001
From: Joris van Vossen <joris.van.vossen@sintecs.nl>
Date: Tue, 28 Aug 2018 16:33:58 +0200
Subject: MT25QU512 Flash support for Grapeboard


diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c
index c366d99..36a6930 100644
--- a/drivers/mtd/spi/spi_flash_ids.c
+++ b/drivers/mtd/spi/spi_flash_ids.c
@@ -131,7 +131,8 @@ const struct spi_flash_info spi_flash_ids[] = {
 	{"n25q256",	   INFO(0x20ba19, 0x0,  64 * 1024,   512, RD_FULL | WR_QPP | SECT_4K) },
 	{"n25q256a",	   INFO(0x20bb19, 0x0,  64 * 1024,   512, RD_FULL | WR_QPP | SECT_4K) },
 	{"n25q512",	   INFO(0x20ba20, 0x0,  64 * 1024,  1024, RD_FULL | WR_QPP | E_FSR | SECT_4K) },
-	{"n25q512a",	   INFO(0x20bb20, 0x0,  64 * 1024,  1024, RD_FULL | WR_QPP | E_FSR | SECT_4K) },
+	/*{"n25q512a",	   INFO(0x20bb20, 0x0,  64 * 1024,  1024, RD_FULL | WR_QPP | E_FSR | SECT_4K) },*/
+	{"mt25qu512a",	   INFO(0x20bb20, 0x0,  64 * 1024,  4096, RD_FULL | WR_QPP | SECT_4K) },
 	{"n25q1024",	   INFO(0x20ba21, 0x0,  64 * 1024,  2048, RD_FULL | WR_QPP | E_FSR | SECT_4K) },
 	{"n25q1024a",	   INFO(0x20bb21, 0x0,  64 * 1024,  2048, RD_FULL | WR_QPP | E_FSR | SECT_4K) },
 	{"mt25qu02g",	   INFO(0x20bb22, 0x0,  64 * 1024,  4096, RD_FULL | WR_QPP | E_FSR | SECT_4K) },
diff --git a/include/configs/grapeboard.h b/include/configs/grapeboard.h
index df93387..ea664a5 100644
--- a/include/configs/grapeboard.h
+++ b/include/configs/grapeboard.h
@@ -66,6 +66,8 @@
 #define CONFIG_FSL_QSPI
 #define QSPI0_AMBA_BASE						0x40000000
 #define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SPI_FLASH_SST
 #define FSL_QSPI_FLASH_SIZE					SZ_64M
 #define FSL_QSPI_FLASH_NUM					1
-- 
cgit v0.10.2