mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
ARM: omap3: evm: Enable DM_USB in defconfig
This addresses the following warning message: ===================== WARNING ====================== This board does not use CONFIG_DM_USB. Please update the board to use CONFIG_DM_USB before the v2019.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/MIGRATION.txt for more info. ==================================================== As USB support for older OMAP3 SoC's improves, OMAP3 EVM can be readily adapted. There is some additional 'gpio-hog' support needed to fully setup USB in a similar manner to Linux. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
This commit is contained in:
committed by
Tom Rini
parent
5579e73c8c
commit
e74e9f620a
@@ -30,11 +30,6 @@
|
|||||||
#include <linux/usb/musb.h>
|
#include <linux/usb/musb.h>
|
||||||
#include "evm.h"
|
#include "evm.h"
|
||||||
|
|
||||||
#ifdef CONFIG_USB_EHCI_HCD
|
|
||||||
#include <usb.h>
|
|
||||||
#include <asm/ehci-omap.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define OMAP3EVM_GPIO_ETH_RST_GEN1 64
|
#define OMAP3EVM_GPIO_ETH_RST_GEN1 64
|
||||||
#define OMAP3EVM_GPIO_ETH_RST_GEN2 7
|
#define OMAP3EVM_GPIO_ETH_RST_GEN2 7
|
||||||
|
|
||||||
@@ -307,32 +302,6 @@ void board_mmc_power_init(void)
|
|||||||
}
|
}
|
||||||
#endif /* CONFIG_MMC */
|
#endif /* CONFIG_MMC */
|
||||||
|
|
||||||
#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
|
|
||||||
/* Call usb_stop() before starting the kernel */
|
|
||||||
void show_boot_progress(int val)
|
|
||||||
{
|
|
||||||
if (val == BOOTSTAGE_ID_RUN_OS)
|
|
||||||
usb_stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct omap_usbhs_board_data usbhs_bdata = {
|
|
||||||
.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
||||||
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
|
||||||
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED
|
|
||||||
};
|
|
||||||
|
|
||||||
int ehci_hcd_init(int index, enum usb_init_type init,
|
|
||||||
struct ehci_hccr **hccr, struct ehci_hcor **hcor)
|
|
||||||
{
|
|
||||||
return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
|
|
||||||
}
|
|
||||||
|
|
||||||
int ehci_hcd_stop(int index)
|
|
||||||
{
|
|
||||||
return omap_ehci_hcd_stop();
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_USB_EHCI_HCD */
|
|
||||||
|
|
||||||
#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET)
|
#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) && !defined(CONFIG_CMD_NET)
|
||||||
int board_eth_init(bd_t *bis)
|
int board_eth_init(bd_t *bis)
|
||||||
{
|
{
|
||||||
|
@@ -66,7 +66,10 @@ CONFIG_SPI=y
|
|||||||
CONFIG_DM_SPI=y
|
CONFIG_DM_SPI=y
|
||||||
CONFIG_OMAP3_SPI=y
|
CONFIG_OMAP3_SPI=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
CONFIG_DM_USB=y
|
||||||
|
# CONFIG_SPL_DM_USB is not set
|
||||||
CONFIG_USB_EHCI_HCD=y
|
CONFIG_USB_EHCI_HCD=y
|
||||||
|
CONFIG_USB_OMAP3=y
|
||||||
CONFIG_USB_MUSB_GADGET=y
|
CONFIG_USB_MUSB_GADGET=y
|
||||||
CONFIG_USB_MUSB_OMAP2PLUS=y
|
CONFIG_USB_MUSB_OMAP2PLUS=y
|
||||||
CONFIG_USB_GADGET=y
|
CONFIG_USB_GADGET=y
|
||||||
|
@@ -52,9 +52,6 @@
|
|||||||
#endif /* CONFIG_SPL_OS_BOOT */
|
#endif /* CONFIG_SPL_OS_BOOT */
|
||||||
#endif /* CONFIG_NAND */
|
#endif /* CONFIG_NAND */
|
||||||
|
|
||||||
/* Environment */
|
|
||||||
#define CONFIG_PREBOOT "usb start"
|
|
||||||
|
|
||||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||||
DEFAULT_LINUX_BOOT_ENV
|
DEFAULT_LINUX_BOOT_ENV
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user