Merge git://git.denx.de/u-boot-socfpga

[people/ms/u-boot.git] / include / configs / silk.h

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 161e0a5e2690d59e1dbff1c850e6617b882e5059..cd839aa63fa8622411239e212c31d8f1d7f08f11 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -42,15 +42,12 @@
 
 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SPI_FLASH_BAR
 #define CONFIG_SH_QSPI
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_SPI_FLASH_QUAD
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1