public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH 7/7] Support for the MX31ADS evaluation board from Freescale
Date: Wed, 26 Mar 2008 15:31:22 +0100	[thread overview]
Message-ID: <20080326143122.B06DB241A2@gemini.denx.de> (raw)
In-Reply-To: Your message of "Wed, 26 Mar 2008 15:01:16 +0100." <Pine.LNX.4.64.0803261456270.5050@axis700.grange>

In message <Pine.LNX.4.64.0803261456270.5050@axis700.grange> you wrote:
> This patch adds support for the MX31ADS evaluation board from Freescale, 
> initialization code is copied from RedBoot sources, also provided by 
> Freescale.
> 
> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>

Sorry, this patch fails:

Applying Support for the MX31ADS evaluation board from Freescale
error: patch failed: include/asm-arm/arch-mx31/mx31-regs.h:133
error: include/asm-arm/arch-mx31/mx31-regs.h: patch does not apply
fatal: mode change for board/imx31_litekit/config.mk, which is not in
current HEAD
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0007.


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
"Open the pod bay doors, HAL."                    - Dave Bowman, 2001

  reply	other threads:[~2008-03-26 14:31 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-26 14:00 [U-Boot-Users] [PATCH 0/7] Respin of Sascha Hauer's i.MX31 support plus MX31ADS Guennadi Liakhovetski
2008-03-26 14:00 ` [U-Boot-Users] [PATCH 1/7] Separate omap24xx specific code from arm1136 Guennadi Liakhovetski
2008-03-26 14:00 ` [U-Boot-Users] [PATCH 2/7] core support for Freescale mx31 Guennadi Liakhovetski
2008-03-26 14:01 ` [U-Boot-Users] [PATCH 3/7] add an i2c driver for mx31 Guennadi Liakhovetski
2008-03-26 14:01 ` [U-Boot-Users] [PATCH 4/7] add SMSC LAN9x1x Network driver Guennadi Liakhovetski
2008-03-29  2:19   ` Mike Frysinger
2008-03-29  2:24     ` [U-Boot-Users] SMSC LAN9x1x EEPROM program Mike Frysinger
2008-04-02 12:03   ` [U-Boot-Users] [PATCH 4/7] add SMSC LAN9x1x Network driver Mark Jonas
2008-04-02 12:18     ` Ben Warren
2008-04-03  6:51       ` Mark Jonas
2008-04-03 14:17         ` Ben Warren
2008-04-04 11:24           ` Mark Jonas
2008-03-26 14:01 ` [U-Boot-Users] [PATCH 5/7] mx31 litekit support Guennadi Liakhovetski
2008-03-26 14:01 ` [U-Boot-Users] [PATCH 6/7] Phytec Phycore-i.MX31 support Guennadi Liakhovetski
2008-03-26 14:01 ` [U-Boot-Users] [PATCH 7/7] Support for the MX31ADS evaluation board from Freescale Guennadi Liakhovetski
2008-03-26 14:31   ` Wolfgang Denk [this message]
2008-03-26 14:47 ` [U-Boot-Users] [PATCH 0/7] Respin of Sascha Hauer's i.MX31 support plus MX31ADS Peter Pearse
2008-03-26 15:02   ` Wolfgang Denk
2008-03-26 15:10     ` Peter Pearse

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=20080326143122.B06DB241A2@gemini.denx.de \
    --to=wd@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