From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] ppc4xx: Add Io and IoCon 405EP board support
Date: Wed, 20 Oct 2010 10:27:53 +0200 [thread overview]
Message-ID: <201010201027.54172.sr@denx.de> (raw)
In-Reply-To: <1287050350-12705-1-git-send-email-eibach@gdsys.de>
Hi Dirk,
On Thursday 14 October 2010 11:59:10 Dirk Eibach wrote:
> Board support for the Guntermann & Drunck CATCenter Io.
> Board support for the Guntermann & Drunck IoCon.
I just tried to apply this patch, but it doesn't work:
[stefan at quad u-boot-ppc4xx (master)]$ git am -3 -s
patches_update-2010-10-20/\[U-Boot\]\ \[PATCH\]\ ppc4xx_Add\ Io\ and\ IoCon\
405EP\ board\ support.mbox
Applying: ppc4xx: Add Io and IoCon 405EP board support
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging MAINTAINERS
Auto-merging MAKEALL
CONFLICT (content): Merge conflict in MAKEALL
Auto-merging boards.cfg
CONFLICT (content): Merge conflict in boards.cfg
Failed to merge in the changes.
I tried to manually resolve these conflicts but stumbled over other problems
with this patch resulting from the latest changes in the MAKEALL rework done
by Wolfgang. You need to remove your config.mk file and add
CONFIG_SYS_TEXT_BASE to your board config headers now.
Please fix (rebase on current u-boot master) and resubmit. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
prev parent reply other threads:[~2010-10-20 8:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-14 9:59 [U-Boot] [PATCH] ppc4xx: Add Io and IoCon 405EP board support Dirk Eibach
2010-10-20 8:27 ` Stefan Roese [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=201010201027.54172.sr@denx.de \
--to=sr@denx.de \
--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