[U-Boot] [PATCH 5/8] fdt_support, usb: Move fdt_fixup_dr_usb routine to drivers/usb/otg

[Wolfgang Denk]

Dear Anton Vorontsov,

In message <20090609202532.GE20493 at oksana.dev.rtsoft.ru> you wrote:
> In subsequent patches we'll use FSL-specific functions in
> fdt_fixup_dr_usb(), so let's move the routine to a more appropriate
> place.
> 
> So far fsl_dr_usb.c isn't actually an USB driver, but eventually it
> will turn into one, let's hope. ;-)
> 
> Also rename CONFIG_HAS_FSL_DR_USB to CONFIG_USB_FSL_DR to be
> consistent with other USB drivers.
> 
> Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
> ---
>  Makefile                                  |    1 +
>  board/freescale/mpc8315erdb/mpc8315erdb.c |    1 +
>  board/freescale/mpc837xemds/mpc837xemds.c |    1 +
>  board/freescale/mpc837xerdb/mpc837xerdb.c |    1 +
>  common/fdt_support.c                      |   41 ----------------------
>  drivers/usb/otg/Makefile                  |   46 +++++++++++++++++++++++++
>  drivers/usb/otg/fsl_dr_usb.c              |   52 +++++++++++++++++++++++++++++
>  include/configs/MPC8315ERDB.h             |    2 +-
>  include/configs/MPC837XEMDS.h             |    2 +-
>  include/configs/MPC837XERDB.h             |    2 +-
>  include/fdt_support.h                     |    6 ---
>  include/fsl_dr_usb.h                      |   21 +++++++++++
>  12 files changed, 126 insertions(+), 50 deletions(-)
>  create mode 100644 drivers/usb/otg/Makefile
>  create mode 100644 drivers/usb/otg/fsl_dr_usb.c
>  create mode 100644 include/fsl_dr_usb.h

Sorry, this patch doesn't apply:

Applying: fdt_support, usb: Move fdt_fixup_dr_usb routine to drivers/usb/otg
error: patch failed: common/fdt_support.c:454
error: common/fdt_support.c: patch does not apply
error: patch failed: include/configs/MPC8315ERDB.h:344
error: include/configs/MPC8315ERDB.h: patch does not apply
error: patch failed: include/fdt_support.h:53
error: include/fdt_support.h: patch does not apply
fatal: sha1 information is lacking or useless (board/freescale/mpc837xemds/mpc837xemds.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0005.

Please rebase and resubmit.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If it has syntax, it isn't user friendly.