From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerry Van Baren <gerald.vanbaren@smiths-aerospace.com>
Date: Wed, 18 Jul 2007 10:49:13 -0400
Subject: [U-Boot-Users] [PATCH 1/2] fdt: do board setup based
 on	fdt	address specified on bootm line
In-Reply-To: <1184769423.3577.1.camel@ld0161-tx32>
References: <20070717135653.010913bc.kim.phillips@freescale.com>	<469D5FC6.8020604@gmail.com>
	<1184769423.3577.1.camel@ld0161-tx32>
Message-ID: <469E2869.60206@smiths-aerospace.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Jon Loeliger wrote:
> On Tue, 2007-07-17 at 19:33, Jerry Van Baren wrote:
>> Hi Kim & Co,
>>
>> I've applied your patches and rebased against the master u-boot repo 
>> (had a minor merge conflict with common/cmd_bootm.c...
> 
> Say it isn't so!
> 
> Oh, alright.  That's the upcoming fate, I'm afraid... :-)
> 
> jdl

The conflict was with Heiko Schocher's patch "make show_boot_progress () 
weak."  I moved one of the SHOW_BOOT_PROGRESS calls as part of the 
cmd_bootm.c reordering and that confused patch, it was unable to make 
the leap.  :-)  NBD.

gvb