diff options
| author | Tom Rini | 2016-09-08 16:31:26 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-09-09 14:59:35 -0400 |
| commit | 645176d1d5c37c91ddb06c366678fbe302550387 (patch) | |
| tree | 3f00c19f4b59c89a35eba30b7cf28a52ae18fc70 /include/configs | |
| parent | aca5cd27db72aa6e664dd4b517b5ed885e711b82 (diff) | |
configs: Migrate CONFIG_USB_STORAGE
In some cases we were missing CONFIG_USB=y so enable that when needed.
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
209 files changed, 0 insertions, 235 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 7d9619eb0bb..2a8aeeead56 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -757,7 +757,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index f2a7c69ad2c..a0ca0db27ca 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -359,7 +359,6 @@ extern unsigned long get_sdram_size(void); #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #define CONFIG_HAS_FSL_DR_USB #endif diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 4744f08c9ad..eb6ddae74be 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -508,7 +508,6 @@ combinations. this should be removed later #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #define CONFIG_HAS_FSL_DR_USB #endif diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 1e052b1b4ba..898ed7d926f 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -93,7 +93,6 @@ /* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_MAC_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index ccebc30e169..a3834f06297 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -72,7 +72,6 @@ #ifdef CONFIG_CMD_USB # define CONFIG_USB_OHCI_NEW -# define CONFIG_USB_STORAGE # ifndef CONFIG_CMD_PCI # define CONFIG_CMD_PCI diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 7e9f978f6b9..c94580e1c42 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -71,7 +71,6 @@ #endif #ifdef CONFIG_CMD_USB -# define CONFIG_USB_STORAGE # define CONFIG_DOS_PARTITION # define CONFIG_USB_OHCI_NEW # ifndef CONFIG_CMD_PCI diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 6ef39dba9e2..5da0005c9bc 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -361,7 +361,6 @@ #if !defined(CONFIG_MIP405T) #define CONFIG_USB_UHCI #define CONFIG_USB_KEYBOARD -#define CONFIG_USB_STORAGE /* Enable needed helper functions */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 23a2e34ce72..9f3dc4999cf 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -372,7 +372,6 @@ #define CONFIG_HAS_FSL_DR_USB #define CONFIG_SYS_SCCR_USBDRCM 3 -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_USB_PHY_TYPE "utmi" diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index c11c0cf8250..177718ebb36 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -151,7 +151,6 @@ /* * Support USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index b2dc1890c74..dd2aa04fa9f 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -379,7 +379,6 @@ extern int board_pci_host_broken(void); #define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */ #define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 8eb87ebde50..e010bd6a14a 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -663,7 +663,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index b536f6764e8..39181609fab 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -639,7 +639,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index cd1043204f1..d8dda87de2c 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -384,7 +384,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_STORAGE #define CONFIG_PCI_EHCI_DEVICE 0 #endif diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 26cf8d633bd..e063c7a63ae 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -583,7 +583,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_USB_STORAGE #define CONFIG_PCI_EHCI_DEVICE 0 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 #endif diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 5ab6602f141..0c84622b4d5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -729,7 +729,6 @@ extern unsigned long get_sdram_size(void); #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 5d572b45a3e..9fbc1283843 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -667,7 +667,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index d044c7bc2ee..c01e72d261d 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -269,7 +269,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #endif #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index e6057f9ea48..3c3504b828a 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -612,7 +612,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_HAS_FSL_MPH_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 9203f85abf5..ecb126b9e31 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -317,7 +317,6 @@ ************************************************************/ #define CONFIG_USB_UHCI #define CONFIG_USB_KEYBOARD -#define CONFIG_USB_STORAGE /* Enable needed helper functions */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index c2e067a399e..c9b0528779b 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -372,7 +372,6 @@ #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS 1 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" -#define CONFIG_USB_STORAGE 1 /* * UBI diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index d3183ff8dcb..7c05ebb70bb 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -249,7 +249,6 @@ /* USB */ #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE #define CONFIG_SYS_OHCI_BE_CONTROLLER #define CONFIG_SYS_USB_OHCI_BOARD_INIT 1 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 2f18f5227b0..2218907a4ee 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -675,7 +675,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 8029ca8a207..d5fd3e956c5 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -669,7 +669,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index b8c6e89f4ed..9488db2c7d9 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -558,7 +558,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index e583defc701..07c511f1d9b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -643,7 +643,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #define CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 3f28549d02e..065ffcd6972 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -722,7 +722,6 @@ unsigned long get_board_ddr_clk(void); * USB */ #ifdef CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 37d16aefdc2..1a8c62e73e6 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -679,7 +679,6 @@ unsigned long get_board_ddr_clk(void); * USB */ #ifdef CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 8fffffe3eed..06f03aa2977 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -522,7 +522,6 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 15b8219bcf2..38ad5038172 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -714,7 +714,6 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 0e4067a3a92..14e06fb87bb 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -127,7 +127,6 @@ defined(CONFIG_STK52XX) #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER -#define CONFIG_USB_STORAGE #undef CONFIG_SYS_USB_OHCI_BOARD_INIT #define CONFIG_SYS_USB_OHCI_CPU_INIT diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 0c9e79f4a51..57748b45a67 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -487,7 +487,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index a60c7c1c283..c5a7d6859d6 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -101,7 +101,6 @@ #define CONFIG_USB_OHCI #define CONFIG_USB_OHCI_S3C24XX #define CONFIG_USB_KEYBOARD -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION /* Enable needed helper functions */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index 4e240c6b89d..bdc81ffde2c 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -70,7 +70,6 @@ /* USB */ #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE #define CONFIG_SYS_OHCI_BE_CONTROLLER #undef CONFIG_SYS_USB_OHCI_BOARD_INIT #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 diff --git a/include/configs/acadia.h b/include/configs/acadia.h index ab9a4ca615d..c10c646f6cd 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -153,7 +153,6 @@ "" #define CONFIG_USB_OHCI -#define CONFIG_USB_STORAGE /* Partitions */ #define CONFIG_MAC_PARTITION diff --git a/include/configs/alt.h b/include/configs/alt.h index 9955674afd1..7d6ec7814bc 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ba4c215463f..f12ee0465e2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -306,10 +306,6 @@ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif - #ifdef CONFIG_USB_MUSB_GADGET /* Removing USB gadget and can be enabled adter adding support usb DM */ #ifndef CONFIG_DM_ETH diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 56a63b4944a..00558030463 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -99,7 +99,6 @@ #ifdef CONFIG_USB_MUSB_HCD -#define CONFIG_USB_STORAGE #define CONGIG_CMD_STORAGE #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c9bc0930e05..4faec82de04 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -98,7 +98,6 @@ #ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE #define CONGIG_CMD_STORAGE #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index fe2c65ffb9c..495dd8afc5f 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -94,7 +94,6 @@ #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_USB_XHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_OMAP_USB_PHY diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index cf74dbe740a..3479de40df0 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -64,7 +64,6 @@ /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_OMAP_USB_PHY diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 514e9eecf22..8c76605f8bc 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -41,7 +41,6 @@ /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* PCI host support */ #define CONFIG_PCI diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 50eaf609b53..92fea877212 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -83,7 +83,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_STORAGE #endif /* RTC */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 640227bf9a5..6dc419e8a56 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -212,7 +212,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index c92ad852380..3cc8d899e76 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -145,7 +145,6 @@ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW 1 #define CONFIG_USB_KEYBOARD 1 -#define CONFIG_USB_STORAGE 1 #define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index c6d3295f34f..fab0374041f 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -175,7 +175,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9260_UHP_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 9c9461bc98f..867bd691037 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -141,7 +141,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9261" #endif #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index e7bfd494504..854caf31ce6 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -277,7 +277,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 290b039e11e..37fa3ec630d 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -122,7 +122,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 297938b93e7..5fdda1af39f 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9n12" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 -#define CONFIG_USB_STORAGE #endif #ifdef CONFIG_SYS_USE_SPIFLASH diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 743fc397d14..637c4037dcf 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9x5" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 #endif -#define CONFIG_USB_STORAGE #endif #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 4f3909af044..fc56c82553e 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -277,10 +277,6 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif - #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 784bfefdb89..6d97755bd1e 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -175,7 +175,6 @@ #ifdef CONFIG_440EP /* USB */ #define CONFIG_USB_OHCI -#define CONFIG_USB_STORAGE /*Comment this out to enable USB 1.1 device*/ #define USB_2_0_DEVICE diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e391c91316b..d8a8c0c63ff 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -456,10 +456,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif - #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_FUNCTION_MASS_STORAGE #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/beaver.h b/include/configs/beaver.h index a1c2002113a..e5fda5c16b1 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -47,7 +47,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index cf8ef8af753..d0a364c330a 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -127,7 +127,6 @@ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN -#define CONFIG_USB_STORAGE #define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index c958a942ec0..ddc4a25aa45 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -130,7 +130,6 @@ #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__) #define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN -#define CONFIG_USB_STORAGE #define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index be28ea33ad9..811dae8ea46 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -153,7 +153,6 @@ #if !defined(__ADSPBF544__) #define CONFIG_USB_MUSB_HCD #define CONFIG_USB_BLACKFIN -#define CONFIG_USB_STORAGE #define CONFIG_USB_MUSB_TIMEOUT 100000 #endif diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index e68e342c125..aac36b1cb5c 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -333,7 +333,6 @@ /* Only Canyonlands (460EX) has USB */ #ifdef CONFIG_460EX #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE #undef CONFIG_SYS_OHCI_BE_CONTROLLER /* 460EX has little endian descriptors */ #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS /* 460EX has little endian register */ #define CONFIG_SYS_OHCI_USE_NPS /* force NoPowerSwitching mode */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 7107b7298d5..5943b047d34 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -50,7 +50,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 74fc377d313..aebb10a8b7e 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -48,7 +48,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 127a28a138e..9a0469da9f7 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -72,7 +72,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 0dd5e996b66..065e70045a4 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -225,7 +225,6 @@ * USB configuration */ #define CONFIG_USB_OHCI 1 -#define CONFIG_USB_STORAGE 1 #define CONFIG_USB_CLOCK 0x0001BBBB #define CONFIG_USB_CONFIG 0x00001000 /* Partitions (for USB) */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 5d717a4a528..562ba561898 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -96,7 +96,6 @@ #define CONFIG_USB_OMAP3 #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index a89ccb73b17..a408fbf678b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -113,8 +113,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #endif /* CONFIG_USB_MUSB_AM35X */ -#define CONFIG_USB_STORAGE - /* commands to include */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index bdfb168f2c5..45fa37a3167 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -61,7 +61,6 @@ /* USB support */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_OMAP_USB_PHY #define CONFIG_AM437X_USB2PHY2_HOST diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index 8e9444e012c..6b51b43badf 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -71,7 +71,6 @@ /* USB UHH support options */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 9da219c9c79..2ec392e4b14 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -209,7 +209,6 @@ #define CONFIG_APBH_DMA_BURST8 /* USB Configs */ -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c15f0cb3931..d9954c1b55d 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -35,7 +35,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 7e98166320b..fbb235d82ce 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -41,7 +41,6 @@ /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index fb68e598b23..9eed333a929 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -225,7 +225,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) /* USB Storage */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE #endif /* __CONFIG_H */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 1a63d032412..29189a43369 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -315,7 +315,6 @@ * USB */ #define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE #define CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 0c99e9f5e6d..c598300f99e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -624,7 +624,6 @@ #define CONFIG_HAS_FSL_MPH_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 746475d45fe..db90f92d988 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -105,7 +105,6 @@ #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 #define CONFIG_DOS_PARTITION -#define CONFIG_USB_STORAGE /* USB DFU support */ #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 8e0ed06f412..c1abcb63b02 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -444,7 +444,6 @@ #define CONFIG_HAS_FSL_MPH_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 82b1f2c9023..b0311bf9a15 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -44,7 +44,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 22f4322e0e8..046302236d7 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -124,7 +124,6 @@ */ #define CONFIG_USB_OHCI_LPC32XX #define CONFIG_USB_ISP1301_I2C_ADDR 0x2d -#define CONFIG_USB_STORAGE /* * U-Boot General Configurations diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index c6d6d41a3b0..8cf02832cd6 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -435,7 +435,6 @@ */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER -#define CONFIG_USB_STORAGE #define CONFIG_USB_CLOCK 0x00013333 #define CONFIG_USB_CONFIG 0x00002000 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ed1ee5453fb..8d5dbc03de5 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -208,7 +208,6 @@ /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_OMAP_USB_PHY diff --git a/include/configs/ds414.h b/include/configs/ds414.h index ff188e206ff..11c1ec48438 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -82,7 +82,6 @@ #endif /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 299c0d58c76..868158b2e01 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -31,7 +31,6 @@ /* USB UHH support options */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 9de11792390..c9e8c8ece3e 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -40,7 +40,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 706ad1d2a3a..1e0bf7b72ab 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -33,7 +33,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index f3f75496889..7053795309e 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -240,7 +240,6 @@ #define CONFIG_MMC_SPI_NPOWER_EGPIO 9 #endif -#define CONFIG_USB_STORAGE #define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_EP93XX #define CONFIG_SYS_USB_OHCI_CPU_INIT diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index f9d4683fcbe..c30b63bd24f 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -186,7 +186,6 @@ #define CONFIG_USB_EHCI /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_MARVELL #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 59a06bab0c4..809ec21de7b 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -40,7 +40,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index bd32cdbf735..ce254b3b43d 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -144,7 +144,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "host" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif /* RTC */ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 153878732b8..421002d0be8 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -153,7 +153,6 @@ /* Enable Time Command */ /* USB */ -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 7a54546f831..52f096eec1a 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -79,7 +79,6 @@ #ifdef CONFIG_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/gose.h b/include/configs/gose.h index 18eaf25e7bc..23707ed936f 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 40ec0308c86..82b18309993 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -109,7 +109,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ARMADA100 #define CONFIG_EHCI_IS_TDI -#define CONFIG_USB_STORAGE #endif /* CONFIG_CMD_USB */ #define CONFIG_DOS_PARTITION diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 4e7819912d7..265f03c1d0c 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -59,7 +59,6 @@ /* USB support */ #if USE_GRUSB #define CONFIG_USB_UHCI -#define CONFIG_USB_STORAGE /* Enable needed helper functions */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #endif diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 61242a12c59..92d64a9ce6d 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -167,7 +167,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/harmony.h b/include/configs/harmony.h index d3ab10e7fa9..2ecae65f8b1 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -43,7 +43,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 9cbccd9dc9e..5e5aa19b4ae 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -64,7 +64,6 @@ /*#define CONFIG_DWC2_DFLT_SPEED_FULL*/ #define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 3420a39adee..56c7ca9b019 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -369,7 +369,6 @@ static inline void tws_data_config_output(unsigned output) #define CONFIG_USB_OHCI #define CONFIG_USB_CLOCK 0x00015555 #define CONFIG_USB_CONFIG 0x00001000 -#define CONFIG_USB_STORAGE /*----------------------------------------------------------------------- * IDE/ATA stuff Supports IDE harddisk diff --git a/include/configs/intip.h b/include/configs/intip.h index 4984dc1ef81..c5af36579c2 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -251,7 +251,6 @@ * USB-OHCI */ #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE #undef CONFIG_SYS_OHCI_BE_CONTROLLER /* 460EX has little endian descriptors*/ #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS /* 460EX has little endian register */ #define CONFIG_SYS_OHCI_USE_NPS /* force NoPowerSwitching mode */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index eb4e3aea386..126e02e40fa 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -92,7 +92,6 @@ /* USB */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_SYS_USB_OHCI_REGS_BASE MPC5XXX_USB diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 7c597904e65..26c629f0cbe 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -44,7 +44,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b98fc298327..a1d96ff59e2 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -82,7 +82,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USB_STORAGE /* Module stop status bits */ /* INTC-RT */ diff --git a/include/configs/lager.h b/include/configs/lager.h index 3be1540d13f..664999c48d4 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -84,7 +84,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#define CONFIG_USB_STORAGE /* MMC */ #define CONFIG_MMC diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index ad81142dcd4..19ad1948caa 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -31,7 +31,6 @@ #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif #define CONFIG_CMD_MEMINFO diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 6e31ca0ba4f..75b60fa3a39 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -127,7 +127,6 @@ #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif /* MMC */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 6046ab78952..d3117e78e20 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -32,7 +32,6 @@ #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif /* diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index abbd1c46235..105702d22ed 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -458,10 +458,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif -#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_XHCI_USB) -#define CONFIG_USB_STORAGE -#endif - /* * Video */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 511b0b3f0fe..90ae770eeff 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -63,10 +63,6 @@ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif -#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_XHCI_USB) -#define CONFIG_USB_STORAGE -#endif - /* * Generic Timer Definitions */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index ee8cb2336cf..a80e33db542 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -388,7 +388,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif /* diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 857ad7b6cc0..70ee046c9d6 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -292,7 +292,6 @@ #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif /* SATA */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index df1455bef34..5e36ca740e3 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -425,7 +425,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #include <asm/fsl_secure_boot.h> diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 86a49a5cd8e..b93e919d0ad 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -319,7 +319,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_USB_XHCI_FSL #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE /* Initial environment variables */ #undef CONFIG_EXTRA_ENV_SETTINGS diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 0abfb00ef0b..d41ae699fbe 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,7 +381,6 @@ #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ -#define CONFIG_USB_STORAGE /* Partitions */ #define CONFIG_MAC_PARTITION diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index e7fd6395e09..cdd24cd9cea 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -94,7 +94,6 @@ #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_EHCI_MXS_PORT1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USB_STORAGE #endif /* SPI */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 781a1623dde..f6bb56107ee 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -178,7 +178,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index b4bd6b0e1ec..cda9464ff47 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -114,7 +114,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE /* USB device */ #define CONFIG_USB_ETHER diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 8387f1920d3..22a54c7ec46 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -94,7 +94,6 @@ #define CONFIG_DOS_PARTITION /* EHCI */ -#define CONFIG_USB_STORAGE #define CONFIG_OMAP3_GPIO_2 #define CONFIG_OMAP3_GPIO_5 #define CONFIG_USB_EHCI diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index f3a6a862d00..ae7ca3b3f5c 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -36,7 +36,6 @@ /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 3cdd0dcf62d..e329105b2b4 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -385,7 +385,6 @@ #define CONFIG_EHCI_MMIO_BIG_ENDIAN /* With big-endian regs */ #define CONFIG_EHCI_DESC_BIG_ENDIAN #define CONFIG_EHCI_IS_TDI -#define CONFIG_USB_STORAGE #endif /* diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 62f4937c662..dd223be4fae 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -127,7 +127,6 @@ */ #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) #define CONFIG_USB_EHCI /* Enable EHCI USB support */ -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 774725871ac..9971c81c80f 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -47,7 +47,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_STORAGE #endif /* Ethernet */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 3f9bb0ab466..0de57370eb3 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -41,7 +41,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_STORAGE #endif /* Framebuffer support */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 068596f397f..b2bf5999a5f 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -103,7 +103,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 1d1178798ef..e57912af275 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -87,7 +87,6 @@ #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DATE -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 93ad048b118..072aafdcbbb 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -87,7 +87,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 1b580f04c71..d259f537d2b 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -54,7 +54,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index d64323ec0f9..366b5b9e530 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -55,7 +55,6 @@ /* USB */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index eb890313171..4e404832696 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -132,7 +132,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 200e46836aa..9cf3c2c02e5 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -17,7 +17,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 25f51bebff4..d3b10e057dc 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -57,7 +57,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 375aa0e5d6b..13589df5758 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -175,7 +175,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 439579dcda4..274cb360021 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -163,7 +163,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 9281fee5f9f..86987df645c 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -175,7 +175,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index b2ba7734be5..614de5fc788 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -205,7 +205,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 822d81f3dc3..f6a636d803f 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -239,7 +239,6 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ /* USB Configs */ -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/nas220.h b/include/configs/nas220.h index dc8e265261c..cca23248629 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -101,7 +101,6 @@ #define CONFIG_USB_EHCI /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ #define CONFIG_EHCI_IS_TDI -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index b651eb303e7..6ad4a3e4886 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -77,7 +77,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_MCS7830 diff --git a/include/configs/novena.h b/include/configs/novena.h index 57d8c3e246a..a1667dd072a 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -146,7 +146,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_KEYBOARD #define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 056f518e4f8..c548ee146fb 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -51,7 +51,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 12b7dc58e43..a28244dad97 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -193,7 +193,6 @@ /* USB */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index fc5de034fe3..c17dcf5c39b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -93,7 +93,6 @@ "1920k(u-boot),128k(u-boot-env),"\ "4m(kernel),-(fs)" -#define CONFIG_USB_STORAGE /* USB storage support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_LED /* LED support */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 2397b5e6a46..b134ac91763 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -234,7 +234,6 @@ #ifdef CONFIG_USB_MUSB_HCD -#define CONFIG_USB_STORAGE #define CONGIG_CMD_STORAGE #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 841e4bdcc45..8dffa892986 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -46,7 +46,6 @@ /* USB EHCI */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index ffa22c3b9e7..a6078daca6f 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -19,7 +19,6 @@ /* USB UHH support options */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 2bf955a7a32..c126990c0ad 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -90,7 +90,6 @@ /* USB UHH support options */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 891abce3e61..9be9d8b32c6 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -56,7 +56,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 /* USB Configs */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 5d0a570b6a2..ae0f6a5638d 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -878,7 +878,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 79e4991563a..6de9acdebe2 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -414,7 +414,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_STORAGE #endif #endif diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index e5dcb25941d..968b89e9acf 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -40,7 +40,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 6133d3f1e71..ffd26db5bb4 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -40,7 +40,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 4c75a26e644..4fa345d59e4 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -41,7 +41,6 @@ /* USB2.0 Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 0e6503206d1..5e59ccba624 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -36,7 +36,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index a649991d1a6..fb5278f2e3b 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -106,7 +106,6 @@ /*---USB -------------------------------------------*/ #if 0 #define CONFIG_USB_OHCI -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #endif diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 32f059de0ab..9babe6a4776 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -405,7 +405,6 @@ RTC configuration /* USB */ #define CONFIG_USB_OHCI -#define CONFIG_USB_STORAGE /* pass open firmware flat tree */ #define OF_CPU "PowerPC,5200@0" diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index d555455b83b..e24dcb99740 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -146,10 +146,6 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif - #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 816c571511f..33b23035524 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -199,10 +199,6 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#if defined(CONFIG_USB_MUSB_HOST) -#define CONFIG_USB_STORAGE -#endif - #if defined(CONFIG_SPL_BUILD) /* disable host part of MUSB in SPL */ /* Disable CPSW SPL support so we fit within the 101KiB limit. */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index ca3c30b0729..1c46ec33a28 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -48,7 +48,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 7d7315ea1c8..c2e2c436da8 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -115,7 +115,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 627e1a77906..34ce0869123 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -58,7 +58,6 @@ /* USB config */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 617f92709d3..635e4397c4c 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -36,7 +36,6 @@ /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 0abd84a1470..537a6d8ecf8 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -235,7 +235,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9261" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 #define CONFIG_SYS_LOAD_ADDR 0x22000000 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index b8ce17e807d..99932481639 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -264,7 +264,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 0e944d871ff..28690c28faa 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00700000 /* _UHP_OHCI_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g45" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 /* board specific(not enough SRAM) */ #define CONFIG_AT91SAM9G45_LCD_BASE PHYS_SDRAM + 0xE00000 diff --git a/include/configs/porter.h b/include/configs/porter.h index e3bf33cc149..7d8a0950cfe 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -86,7 +86,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USB_STORAGE /* SD */ #define CONFIG_MMC diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h index 375515e1c46..21bf088c1b0 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -43,7 +43,6 @@ #endif #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x4c000000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "pxa-ohci" -#define CONFIG_USB_STORAGE #endif #endif /* __CONFIG_PXA_COMMON_H__ */ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index e34814bd5e3..8d4ad5d6087 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -98,7 +98,6 @@ #else #define CONFIG_USB_DWC2_REG_ADDR 0x20980000 #endif -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_TFTP_TSIZE diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index d91d75eb402..c1c01bd2eea 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -72,7 +72,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index f9a8f6f3e9e..563c045dc95 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -68,7 +68,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 55615eab017..fef925fece5 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -99,7 +99,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "SAMA5D3 Xplained" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #define CONFIG_DOS_PARTITION -#define CONFIG_USB_STORAGE #endif #if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 1e721a90202..248de8db087 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -132,7 +132,6 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "sama5d3" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 #define CONFIG_DOS_PARTITION -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 8d141a9a32e..d874ab524ec 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -76,7 +76,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 4b1908086fd..61c3f85cc24 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -76,7 +76,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index b490b62c2dc..0a8a637f55d 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -48,7 +48,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_STORAGE #endif /* Booting Linux */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 4c0196679f3..3076ef402fa 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -45,7 +45,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index d34811fe639..ac783d33ef3 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -214,7 +214,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #endif -#define CONFIG_USB_STORAGE /* Comment this out to enable USB 1.1 device */ #define USB_2_0_DEVICE diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 794c48c49a2..1c60d21913c 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -17,7 +17,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SH_ZIMAGEBOOT -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_MAC_PARTITION diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 1f9b3905b4c..3eca93b996a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -220,9 +220,6 @@ #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER diff --git a/include/configs/silk.h b/include/configs/silk.h index 8c4ee4f6ad0..19c6297c6ef 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index e3288429b5d..c8148bb7aec 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -51,7 +51,6 @@ #define CONFIG_USB_OHCI #define CONFIG_USB_OHCI_S3C24XX #define CONFIG_USB_KEYBOARD -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION /************************************************************ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index b33bec94a06..978c627b22c 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_UHP_BASE #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE /* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index c91ab7186ce..aab286fad15 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -69,7 +69,6 @@ #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 #define CONFIG_DOS_PARTITION -#define CONFIG_USB_STORAGE #define CONFIG_PARTITION_UUIDS /* MMC */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index ce5781b8065..81f56518c5d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -234,7 +234,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 -#define CONFIG_USB_STORAGE #endif /* diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 624cef712df..29f95229db8 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -420,6 +420,5 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS 1 #define CONFIG_DOS_PARTITION 1 -#define CONFIG_USB_STORAGE 1 #endif /* __CONFIG_H */ diff --git a/include/configs/stout.h b/include/configs/stout.h index 8833c50b42a..e3b9325961f 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -90,7 +90,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -#define CONFIG_USB_STORAGE /* MMC */ #define CONFIG_MMC diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 35030fe874c..a63db65d3af 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -91,7 +91,6 @@ #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE /* commands to include */ #define CONFIG_CMD_NAND /* NAND support */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 7b6ebdaff52..696ca32c9cb 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -276,7 +276,6 @@ #define CONFIG_USB_ETHER #define CONFIG_USB_ETHER_RNDIS -#define CONFIG_USB_STORAGE #define CONGIG_CMD_STORAGE /* Defines for SPL */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 513e6552548..2c41dd8eb64 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE /* USB DFU support */ #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 640bce4b0a0..85501bca0ff 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -119,7 +119,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_USB_STORAGE #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index d7f1a7cb92f..0e9d98c2d0d 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -40,7 +40,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/tec.h b/include/configs/tec.h index a90af067926..7b1429925e4 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -36,7 +36,6 @@ /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index b206ce4bf93..a9990b73838 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -148,9 +148,6 @@ #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA #endif -#ifdef CONFIG_USB_STORAGE -#undef CONFIG_USB_STORAGE -#endif #ifdef CONFIG_CMD_USB #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index c830c0c0bf6..c8df48adc8c 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -197,7 +197,6 @@ /* USB Configuration */ #define CONFIG_USB_XHCI_KEYSTONE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #define CONFIG_EFI_PARTITION #define CONFIG_FS_FAT #define CONFIG_USB_SS_BASE KS2_USB_SS_BASE diff --git a/include/configs/titanium.h b/include/configs/titanium.h index c6ba0173839..f550aab2473 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -53,7 +53,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 77ced7179a0..3173dc0c170 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -89,7 +89,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 9d49f638035..a4ca7c7739d 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -43,7 +43,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index ad541921942..39ac18967ea 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -111,7 +111,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #endif #define CONFIG_SYS_LOAD_ADDR 0x22000000 diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 5484204d49c..23092db33d2 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -51,7 +51,6 @@ /* USB */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX5 -#define CONFIG_USB_STORAGE #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 5ebdf5b4024..03ff0c65ea0 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -69,7 +69,6 @@ * USB */ #define CONFIG_USB_OHCI -#define CONFIG_USB_STORAGE #define CONFIG_USB_CLOCK 0x0001BBBB #define CONFIG_USB_CONFIG 0x00001000 diff --git a/include/configs/vct.h b/include/configs/vct.h index 2bc98a8e8a3..168902cb2f8 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -99,7 +99,6 @@ #endif #if defined(CONFIG_CMD_USB) -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 1d24437cba1..72fa9736d70 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -41,7 +41,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/ventana.h b/include/configs/ventana.h index cdf50e30bab..b2824672a94 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -34,7 +34,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 4ae179c4dee..0f3fc8f7d5c 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -77,7 +77,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_USB_STORAGE #endif /* USB device */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 2a00ff409a0..295f8346028 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -61,7 +61,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/warp.h b/include/configs/warp.h index 12c7c383c10..66651841f65 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -65,7 +65,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 5cbc2c4d37b..89a6fccb1e9 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -131,7 +131,6 @@ #define CONFIG_SYS_MMC_ENV_PART 0 /* USB Configs */ -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 9c194d5d397..0cd892ed73d 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -43,7 +43,6 @@ /* USB Host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE /* USB networking support */ #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/x600.h b/include/configs/x600.h index 748e3317a7e..4af6b67f9e8 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -104,7 +104,6 @@ /* USB EHCI options */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SPEAR -#define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index fdefeaf24cf..74b25221920 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -175,7 +175,6 @@ #define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_USB_STORAGE #define CONFIG_USB_KEYBOARD #define CONFIG_SYS_USB_EVENT_POLL diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 276dde7d3e3..ded6bbfb5a5 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -343,7 +343,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * USB */ -#define CONFIG_USB_STORAGE #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 4625dafd88b..26be33787a9 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -80,7 +80,6 @@ /* USB Configs */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 03cad101f62..07077688125 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -165,7 +165,6 @@ #ifdef CONFIG_440EP /* USB */ #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE #define CONFIG_SYS_OHCI_BE_CONTROLLER #undef CONFIG_SYS_USB_OHCI_BOARD_INIT diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index ea1ead23b72..7038e6b22c5 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -91,7 +91,6 @@ #define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL #define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN) #define CONFIG_EHCI_IS_TDI -#define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ |