public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] patch error
  2013-02-25 18:51 ` Benoît Thébaudeau
@ 2013-02-26  1:02   ` wanxs
  0 siblings, 0 replies; 4+ messages in thread
From: wanxs @ 2013-02-26  1:02 UTC (permalink / raw)
  To: u-boot

Dear Beno?t Th?baude,
	I git the u-boot-imx from denx.And I patch your patches,but I get error
as:
git apply
U-Boot-v7-14-19-imx-Fix-automatic-make-targets-for-imx-images.patch

error:
error: patch failed: Makefile:486
error: Makefile: patch does not apply
How can i do?
                                                   thanks
                                                                wanxs

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] patch error
@ 2013-02-26  1:06 wanxs
  2013-02-26  7:16 ` Marek Vasut
  2013-02-26 11:28 ` Benoît Thébaudeau
  0 siblings, 2 replies; 4+ messages in thread
From: wanxs @ 2013-02-26  1:06 UTC (permalink / raw)
  To: u-boot

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

                                                     your 
                                             wanxs

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] patch error
  2013-02-26  1:06 [U-Boot] patch error wanxs
@ 2013-02-26  7:16 ` Marek Vasut
  2013-02-26 11:28 ` Benoît Thébaudeau
  1 sibling, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2013-02-26  7:16 UTC (permalink / raw)
  To: u-boot

Dear wanxs,

it is usually polite to supply your full name in the email.

> 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

The patch depends on the OBJTREE vs. obj fixes.

>                                                      your
>                                              wanxs

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] patch error
  2013-02-26  1:06 [U-Boot] patch error wanxs
  2013-02-26  7:16 ` Marek Vasut
@ 2013-02-26 11:28 ` Benoît Thébaudeau
  1 sibling, 0 replies; 4+ messages in thread
From: Benoît Thébaudeau @ 2013-02-26 11:28 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-02-26 11:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-26  1:06 [U-Boot] patch error wanxs
2013-02-26  7:16 ` Marek Vasut
2013-02-26 11:28 ` Benoît Thébaudeau
  -- strict thread matches above, loose matches on Subject: below --
2013-02-25 18:19 [U-Boot] [PATCH 1/4] common: imx: Implement generic u-boot.nand target Marek Vasut
2013-02-25 18:51 ` Benoît Thébaudeau
2013-02-26  1:02   ` [U-Boot] patch error wanxs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox