Re: [U-Boot-Users] [PATCH 1/2] fdt: do board setup based on fdt address specified on bootm line

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