diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
| commit | 607b3ae27efdb709719f0713113fcf4b073676c1 (patch) | |
| tree | e8453252f9987f99deeb7d7b98b7b6d99b5433cf /board/tqm5200/tqm5200.c | |
| parent | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (diff) | |
| parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
| download | u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.zip u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.tar.gz u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.tar.bz2 | |
Merge commit 'remotes/wd/master' into newmaster
Diffstat (limited to 'board/tqm5200/tqm5200.c')
| -rw-r--r-- | board/tqm5200/tqm5200.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c index d10cb59..da4e228 100644 --- a/board/tqm5200/tqm5200.c +++ b/board/tqm5200/tqm5200.c @@ -441,15 +441,21 @@ ulong post_word_load (void) } #endif /* CONFIG_POST || CONFIG_LOGBUFFER*/ -#ifdef CONFIG_PS2MULT #ifdef CONFIG_BOARD_EARLY_INIT_R int board_early_init_r (void) { +#ifdef CONFIG_PS2MULT ps2mult_early_init(); +#endif /* CONFIG_PS2MULT */ + +#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) + /* Low level USB init, required for proper kernel operation */ + usb_cpu_init(); +#endif + return (0); } #endif -#endif /* CONFIG_PS2MULT */ #ifdef CONFIG_FO300 int silent_boot (void) |