[U-Boot-Users] [PATCH v2 7/7] Support for the MX31ADS evaluation board from Freescale

[Wolfgang Denk]

In message <Pine.LNX.4.64.0803262023180.5050 at axis700.grange> you wrote:
> This patch adds support for the MX31ADS evaluation board from Freescale, 
> initialization code is copied from RedBoot sources, also provided by 
> Freescale.
> 
> Signed-off-by: Guennadi Liakhovetski <lg at denx.de>

Cannot apply this one:

Applying Support for the MX31ADS evaluation board from Freescale
error: patch failed: include/asm-arm/arch-mx31/mx31-regs.h:133
error: include/asm-arm/arch-mx31/mx31-regs.h: patch does not apply
fatal: mode change for board/imx31_litekit/config.mk, which is not in
current HEAD
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please fix 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
So we follow our wandering paths, and the very darkness acts  as  our
guide and our doubts serve to reassure us. - Jean-Pierre de Caussade,
eighteenth-century Jesuit priest