diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
| commit | 7e8f270292ebacb25f366181f2022c819e5c7586 (patch) | |
| tree | 841cf474e29eedf6c173da8d1901d3b24d06ecbd /include | |
| parent | e16e137c377c8b96d8d91263d0b6d8470169f841 (diff) | |
| parent | 192eab9357473e09218e0a4448b220d691d9d886 (diff) | |
| download | u-boot-imx-7e8f270292ebacb25f366181f2022c819e5c7586.zip u-boot-imx-7e8f270292ebacb25f366181f2022c819e5c7586.tar.gz u-boot-imx-7e8f270292ebacb25f366181f2022c819e5c7586.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/pic32mzdask.h | 7 | ||||
| -rw-r--r-- | include/fdt_support.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 3ea1194..78faaec 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -105,6 +105,12 @@ #define CONFIG_GENERIC_MMC #define CONFIG_CMD_MMC +/*-------------------------------------------------- + * USB Configuration + */ +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_SYS_CACHELINE_SIZE 16 + /*----------------------------------------------------------------------- * File System Configuration */ @@ -153,6 +159,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> diff --git a/include/fdt_support.h b/include/fdt_support.h index 296add0..d34e959 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -113,11 +113,11 @@ void fdt_fixup_qe_firmware(void *fdt); */ int fdt_fixup_display(void *blob, const char *path, const char *display); -#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) +#if defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) void fdt_fixup_dr_usb(void *blob, bd_t *bd); #else static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} -#endif /* defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) */ +#endif /* defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) */ #if defined(CONFIG_SYS_FSL_SEC_COMPAT) void fdt_fixup_crypto_node(void *blob, int sec_rev); |