[U-Boot] [PATCH] powerpc: Cleanup BOOTFLAG_* usage

[Wolfgang Denk]

Dear Peter Tyser,

In message <1284355310-25449-1-git-send-email-ptyser at xes-inc.com> you wrote:
> BOOTFLAG_COLD and BOOTFLAG_WARM have identical definitions for every
> PowerPC board, so share a common definition.
> 
> Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
> ---
> It looks like there are only a few boards (5) that use the warm/cold
> boot concept, maybe we should remove this largely unused feature?
> Or at least remove it for most CPU types?  Is anyone out there
> using it?

Sorry, this doesn't apply any more:

fatal: sha1 information is lacking or useless
(include/configs/XPEDITE5170.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 powerpc: Cleanup BOOTFLAG_* usage


Can you please have a look?

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
I think animal testing is a terrible idea; they get all  nervous  and
give the wrong answers.