diff options
| -rw-r--r-- | configs/db-88f6820-gp_defconfig | 5 | ||||
| -rw-r--r-- | configs/db-mv784mp-gp_defconfig | 5 | ||||
| -rw-r--r-- | include/configs/db-88f6820-gp.h | 4 | ||||
| -rw-r--r-- | include/configs/db-mv784mp-gp.h | 4 | ||||
| -rw-r--r-- | include/configs/mv-common.h | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index f2b1126689..6f612d9098 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -5,5 +5,10 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index df17dba53a..258e4d69e9 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -5,6 +5,11 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp" CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 15f7bdfac5..74e5b4759f 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -50,7 +50,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_TFTPPUT #define CONFIG_CMD_TIME -#define CONFIG_CMD_USB /* I2C */ #define CONFIG_SYS_I2C @@ -93,9 +92,6 @@ #define CONFIG_SUPPORT_VFAT /* USB/EHCI configuration */ -#define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE -#define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI /* Environment in SPI NOR flash */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 5b39762303..672518b83f 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -42,7 +42,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_TFTPPUT #define CONFIG_CMD_TIME -#define CONFIG_CMD_USB /* I2C */ #define CONFIG_SYS_I2C @@ -52,9 +51,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* USB/EHCI configuration */ -#define CONFIG_USB_EHCI -#define CONFIG_USB_STORAGE -#define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 92e5429929..a2f60dc527 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -128,7 +128,7 @@ /* * Common USB/EHCI configuration */ -#ifdef CONFIG_CMD_USB +#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) #define CONFIG_USB_EHCI /* Enable EHCI USB support */ #define CONFIG_USB_STORAGE #define CONFIG_DOS_PARTITION |