Skip to contentSkip to conversation

patch error

U-Boot wanxs 3 participants 3 messages Feb 26, 2013

lore
Share & tools
lore

wanxs

author
#0 lore raw

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

#1 lore raw

Dear wanxs,

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

Quoted 10 lines

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.

Quoted 2 lines

your
wanxs

Best regards,
Marek Vasut

#2 lore raw
In reply to wanxs

Dear "wanxs",

Quoted 10 lines · wanxs

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