[U-Boot] [PATCH] ppc4xx: Add Io and IoCon 405EP board support

[Stefan Roese]

Hi Dirk,

On Thursday 14 October 2010 11:59:10 Dirk Eibach wrote:
> Board support for the Guntermann & Drunck CATCenter Io.
> Board support for the Guntermann & Drunck IoCon.

I just tried to apply this patch, but it doesn't work:

[stefan at quad u-boot-ppc4xx (master)]$ git am -3 -s 
patches_update-2010-10-20/\[U-Boot\]\ \[PATCH\]\ ppc4xx_Add\ Io\ and\ IoCon\ 
405EP\ board\ support.mbox
Applying: ppc4xx: Add Io and IoCon 405EP board support
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging MAINTAINERS
Auto-merging MAKEALL
CONFLICT (content): Merge conflict in MAKEALL
Auto-merging boards.cfg
CONFLICT (content): Merge conflict in boards.cfg
Failed to merge in the changes.

I tried to manually resolve these conflicts but stumbled over other problems 
with this patch resulting from the latest changes in the MAKEALL rework done 
by Wolfgang. You need to remove your config.mk file and add 
CONFIG_SYS_TEXT_BASE to your board config headers now.

Please fix (rebase on current u-boot master) and resubmit. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de