1 files changed, 3 insertions, 44 deletions

diff --git a/src/mainboard/facebook/fbg1701/w25q64.c b/src/mainboard/facebook/fbg1701/w25q64.c
index bc908f04b3..2f131f4ec6 100644
--- a/src/mainboard/facebook/fbg1701/w25q64.c
+++ b/src/mainboard/facebook/fbg1701/w25q64.c
@@ -20,57 +20,16 @@
 #include <drivers/spi/spi_winbond.h>
 
 /*
- * SPI lockdown configuration
+ * SPI VSCC configuration
  */
-#define SPI_OPMENU_0	CMD_W25_WRSR		/* Write Status Register */
-#define SPI_OPTYPE_0	SPI_OPTYPE_WR_NOADDR	/* Write, no address */
-
-#define SPI_OPMENU_1	CMD_W25_PP		/* BYPR: Byte Program */
-#define SPI_OPTYPE_1	SPI_OPTYPE_WR_ADDR	/* Write, address required */
-
-#define SPI_OPMENU_2	CMD_W25_READ		/* Read Data */
-#define SPI_OPTYPE_2	SPI_OPTYPE_RD_ADDR	/* Read, address required */
-
-#define SPI_OPMENU_3	CMD_W25_RDSR		/* Read Status Register */
-#define SPI_OPTYPE_3	SPI_OPTYPE_RD_NOADDR	/* Read, no address */
-
-#define SPI_OPMENU_4	CMD_W25_SE		/* Sector Erase */
-#define SPI_OPTYPE_4	SPI_OPTYPE_WR_ADDR	/* Write, address required */
-
-#define SPI_OPMENU_5	CMD_W25_RDID		/* Read ID */
-#define SPI_OPTYPE_5	SPI_OPTYPE_RD_NOADDR	/* Read, no address */
-
-#define SPI_OPMENU_6	CMD_W25_BE		/* BE: Block Erase */
-#define SPI_OPTYPE_6	SPI_OPTYPE_WR_ADDR	/* Write, address required */
-
-#define SPI_OPMENU_7	CMD_W25_FAST_READ	/* FAST: Fast Read */
-#define SPI_OPTYPE_7	SPI_OPTYPE_RD_ADDR	/* Read, address required */
-
-#define SPI_OPPREFIX	CMD_W25_WREN		/* WREN only to be inline */
-						/* with flashrom */
-
-#define SPI_OPTYPE ((SPI_OPTYPE_7 << 14) | (SPI_OPTYPE_6 << 12) | \
-		    (SPI_OPTYPE_5 << 10) | (SPI_OPTYPE_4 <<  8) | \
-		    (SPI_OPTYPE_3 <<  6) | (SPI_OPTYPE_2 <<  4) | \
-		    (SPI_OPTYPE_1 <<  2) | (SPI_OPTYPE_0 <<  0))
-
-#define SPI_OPMENU_UPPER ((SPI_OPMENU_7 << 24) | (SPI_OPMENU_6 << 16) | \
-			  (SPI_OPMENU_5 <<  8) | (SPI_OPMENU_4 <<  0))
-
-#define SPI_OPMENU_LOWER ((SPI_OPMENU_3 << 24) | (SPI_OPMENU_2 << 16) | \
-			  (SPI_OPMENU_1 <<  8) | (SPI_OPMENU_0 <<  0))
-
 #define SPI_VSCC (WG_64_BYTE | EO(0x20) | BES_4_KB)
 
-static const struct spi_config spi_config = {
-	.preop = CMD_W25_WREN,
-	.optype = SPI_OPTYPE,
-	.opmenu = { SPI_OPMENU_LOWER, SPI_OPMENU_UPPER },
+static const struct vscc_config spi_config = {
 	.lvscc =  SPI_VSCC,
 	.uvscc =  SPI_VSCC,
 };
 
-int mainboard_get_spi_config(struct spi_config *cfg)
+int mainboard_get_spi_vscc_config(struct vscc_config *cfg)
 {
 	memcpy(cfg, &spi_config, sizeof(*cfg));