diff options
| author | Adam Ford <aford173@gmail.com> | 2019-07-02 10:36:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-27 13:36:53 -0400 |
| commit | 7f89cb29ef08f0e4f69c12222a19a63927fe427c (patch) | |
| tree | a03c0937933e36645a7ad46d3e4b3e695f665b7d | |
| parent | 02acbb9472e0e981c3e4b33357723258b2468405 (diff) | |
| download | u-boot-7f89cb29ef08f0e4f69c12222a19a63927fe427c.tar.gz | |
ARM: da850evm: Remove legacy OHCI referencs and unify platform
OHCI was added with DM_USB support, so there are a few unneeded
items in the header file that can be removed. This also
unifies da850evm with NOR and NAND booting options so all have
OHCI support.
Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Migrate da850_am18xxevm]
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | configs/da850_am18xxevm_defconfig | 6 | ||||
| -rw-r--r-- | configs/da850evm_defconfig | 1 | ||||
| -rw-r--r-- | configs/da850evm_direct_nor_defconfig | 6 | ||||
| -rw-r--r-- | configs/da850evm_nand_defconfig | 6 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index adcbe1d35d..f7054b4a1e 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -58,4 +58,10 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_STORAGE=y # CONFIG_FAT_WRITE is not set diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index f7c679d3b5..99300cb297 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -74,5 +74,6 @@ CONFIG_DM_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_STORAGE=y # CONFIG_FAT_WRITE is not set CONFIG_USE_TINY_PRINTF=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 9b1da07384..dcb4d96d0d 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -61,3 +61,9 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_STORAGE=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index 8f06b8592b..7065205783 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -67,5 +67,11 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_STORAGE=y # CONFIG_FAT_WRITE is not set CONFIG_USE_TINY_PRINTF=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ccdac0abec..7550745a5b 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -268,12 +268,8 @@ #endif /* USB Configs */ -#define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_USB_OHCI_NEW -#define CONFIG_USB_STORAGE -#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x01E25000 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 -#define CONFIG_SYS_USB_OHCI_SLOT_NAME "da850evm" #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ |