From: Wolfgang Denk Date: Tue, 12 Oct 2010 23:03:43 +0200 Subject: [U-Boot] [PATCH 5/5] powerpc: Cleanup BOOTFLAG_* references In-Reply-To: <1284509634-11899-5-git-send-email-ptyser@xes-inc.com> References: <1284509634-11899-1-git-send-email-ptyser@xes-inc.com> <1284509634-11899-5-git-send-email-ptyser@xes-inc.com> Message-ID: <20101012210343.709D51365CD@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Peter Tyser, In message <1284509634-11899-5-git-send-email-ptyser@xes-inc.com> you wrote: > Now that warm booting is not supported, there isn't a need for the > BOOTFLAG_COLD and BOOTFLAG_WARM defines, so remove them. > > Note that this change makes the board info bd_bootflags field useless. > It will always be set to 0, but we leave it around so that we don't > break the board info structure that some OSes are expecting to be passed > from U-Boot. > > Signed-off-by: Peter Tyser Sorry, this does not apply any more: Applying: powerpc: Cleanup BOOTFLAG_* references fatal: sha1 information is lacking or useless (arch/powerpc/lib/board.c). 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_* references 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 While money can't buy happiness, it certainly lets you choose your own form of misery.