Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD

[platform/kernel/u-boot.git] / include / configs / silk.h

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 161e0a5..38febae 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -13,17 +13,17 @@
 
 #undef DEBUG
 #define CONFIG_R8A7794
-#define CONFIG_RMOBILE_BOARD_STRING "Silk"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
 
 #include "rcar-gen2-common.h"
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_TEXT_BASE   0x70000000
 #else
 #define CONFIG_SYS_TEXT_BASE   0xE6304000
 #endif
 
-#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
+#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT)
 #define CONFIG_SYS_INIT_SP_ADDR                0x7003FFFC
 #else
 #define CONFIG_SYS_INIT_SP_ADDR                0xE633FFFC
@@ -42,15 +42,10 @@
 
 /* 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
@@ -73,7 +68,6 @@
 #define CONFIG_SYS_TMU_CLK_DIV  4
 
 /* i2c */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_SH
 #define CONFIG_SYS_I2C_SLAVE           0x7F
@@ -88,15 +82,11 @@
 #define CONFIG_SYS_I2C_POWERIC_ADDR    0x58 /* da9063 */
 
 /* USB */
-#define CONFIG_USB_STORAGE
-#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* MMCIF */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_CMD_MMC
 #define CONFIG_SH_MMCIF
 #define CONFIG_SH_MMCIF_ADDR   0xee200000
 #define CONFIG_SH_MMCIF_CLK    48000000