Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index db3d4e550d693cd827ed5e0db71abf3b847c7605..06f6ed1fc0c2aa3f9d996e153d791a6b72a76fa6 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -174,9 +174,7 @@
 #ifdef SPIFLASH
 # define CONFIG_SYS_NO_FLASH           1
 # define CONFIG_SYS_SPI_BASE           XILINX_SPI_FLASH_BASEADDR
-# define CONFIG_XILINX_SPI             1
 # define CONFIG_SPI                    1
-# define CONFIG_SPI_FLASH_STMICRO      1
 # define CONFIG_SF_DEFAULT_MODE                SPI_MODE_3
 # define CONFIG_SF_DEFAULT_SPEED       XILINX_SPI_FLASH_MAX_FREQ
 # define CONFIG_SF_DEFAULT_CS          XILINX_SPI_FLASH_CS