From: Jerry Van Baren <gerald.vanbaren@smiths-aerospace.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH 1/2] fdt: do board setup based on fdt address specified on bootm line
Date: Wed, 18 Jul 2007 10:49:13 -0400 [thread overview]
Message-ID: <469E2869.60206@smiths-aerospace.com> (raw)
In-Reply-To: <1184769423.3577.1.camel@ld0161-tx32>
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
prev parent reply other threads:[~2007-07-18 14:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-17 18:56 [U-Boot-Users] [PATCH 1/2] fdt: do board setup based on fdt address specified on bootm line Kim Phillips
2007-07-17 19:30 ` Jerry Van Baren
2007-07-18 0:33 ` Jerry Van Baren
2007-07-18 14:37 ` Jon Loeliger
2007-07-18 14:49 ` Jerry Van Baren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=469E2869.60206@smiths-aerospace.com \
--to=gerald.vanbaren@smiths-aerospace.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox