From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= <benoit.thebaudeau@advansee.com>
Date: Tue, 26 Feb 2013 12:28:57 +0100 (CET)
Subject: [U-Boot] patch error
In-Reply-To: <1361840789.2435.8.camel@wanxs-squeeze>
References: <1361840789.2435.8.camel@wanxs-squeeze>
Message-ID: <395913238.120296.1361878137881.JavaMail.root@advansee.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

Dear "wanxs",

On Tuesday, February 26, 2013 2:06:29 AM, "wanxs" wrote:
> Dear Marek Vasut,
> 	Thanks for your patches.But when I patch them to my u-boot,I get a
> error.
> 	I get u-boot-imx from denx.
> git apply
> U-Boot-1-4-common-imx-Implement-generic-u-boot.nand-target.patch
> 
> error: patch failed: Makefile:470
> error: Makefile: patch does not apply
> error: patch failed: arch/arm/imx-common/Makefile:50

u-boot-imx/master has changed since my v7.

For v7, you should use u-boot-imx/master at commit
4adfcd68cc10449e2fda0f9fac8b09f2b5c09a02.

For my future v8, u-boot-imx/master at HEAD will be fine.

Best regards,
Beno?t