Re: [U-Boot] [PATCH] ppc4xx: Fix CATcenter build and add it to MAKEALL

Hi Wolfgang,

On Wednesday 22 September 2010 22:52:03 Wolfgang Denk wrote:

...

• CATcenter \

  CMS700 \ CPCI2DP \ CPCI405 \

This will result in a merge conflict when pulling into "next", where this entry does not exist any more as it gets auto-generated fro boards.cfg

Can we please omit this from this patch?

Yes, will send an updated patch in a few minutes.

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@denx.de