Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com --- arch/powerpc/cpu/mpc8xxx/fdt.c | 3 ++- board/freescale/corenet_ds/corenet_ds.c | 1 + include/configs/corenet_ds.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index d9e3e7e..60cb210 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -164,7 +164,8 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd) if (mode_idx < 0 && phy_idx < 0) printf("WARNING: invalid phy or mode\n"); } else { - break; + if (i > CONFIG_SYS_USB_DEVICE) + break; } } if (!usb1_defined) { diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index cf9b7b8..b1e7823 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -236,6 +236,7 @@ void ft_board_setup(void *blob, bd_t *bd) #endif
fdt_fixup_liodn(blob); + fdt_fixup_dr_usb(blob, bd); }
int board_eth_init(bd_t *bis) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index c9cc22a..2c86ba3 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -580,6 +580,8 @@ #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_CMD_EXT2 +#define CONFIG_HAS_FSL_DR_USB +#define CONFIG_SYS_USB_DEVICE 2
#define CONFIG_MMC