[#4122] adeos patch fails to apply to 08r1 branch

Submitted By: Mingquan Pan

Open Date

2008-05-22 06:51:01 Close Date

2008-05-27 22:19:26

Priority:

Medium High Assignee:

Yi Li

Status:

Closed Fixed In Release:

N/A

Found In Release:

N/A Release:

Category:

N/A Board:

N/A

Processor:

N/A Silicon Revision:

Is this bug repeatable?:

Yes Resolution:

Fixed

Uboot version or rev.:

Toolchain version or rev.:

08r1-8

App binary format:

N/A

Summary: adeos patch fails to apply to 08r1 branch

Details:

adeos patch fails to apply to 08r1 branch now .

make[3]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user/busybox'

patching file arch/blackfin/Kconfig

patching file arch/blackfin/kernel/bfin_gpio.c

make[3]: Entering directory `/home/test/work/cruise/checkouts/uclinux-dist/user/busybox'

make[3]: warning: -jN forced in submake: disabling jobserver mode.

patching file arch/blackfin/kernel/entry.S

patching file arch/blackfin/kernel/ipipe.c

patching file arch/blackfin/kernel/irqchip.c

patching file arch/blackfin/kernel/Makefile

patching file arch/blackfin/kernel/mcount.S

patching file arch/blackfin/kernel/process.c

patching file arch/blackfin/kernel/time.c

patching file arch/blackfin/kernel/traps.c

patching file arch/blackfin/lib/ins.S

Hunk #1 FAILED at 35.

1 out of 1 hunk FAILED -- saving rejects to file arch/blackfin/lib/ins.S.rej

patching file arch/blackfin/mach-bf527/Kconfig

patching file arch/blackfin/mach-bf533/Kconfig

patching file arch/blackfin/mach-bf537/Kconfig

patching file arch/blackfin/mach-bf548/Kconfig

patching file arch/blackfin/mach-bf561/Kconfig

patching file arch/blackfin/mach-common/entry.S

patching file arch/blackfin/mach-common/interrupt.S

patching file arch/blackfin/mach-common/ints-priority.c

patching file drivers/pci/htirq.c

patching file drivers/serial/bfin_5xx.c

patching file include/asm-blackfin/atomic.h

patching file include/asm-blackfin/bitops.h

patching file include/asm-blackfin/entry.h

patching file include/asm-blackfin/ipipe_base.h

patching file include/asm-blackfin/ipipe.h

patching file include/asm-blackfin/mach-bf527/cdefBF52x_base.h

patching file include/asm-blackfin/mach-bf527/irq.h

patching file include/asm-blackfin/mach-bf533/cdefBF532.h

patching file include/asm-blackfin/mach-bf537/cdefBF534.h

patching file include/asm-blackfin/mach-bf548/cdefBF54x_base.h

patching file include/asm-blackfin/mach-bf548/irq.h

patching file include/asm-blackfin/mach-bf561/cdefBF561.h

patching file include/asm-blackfin/system.h

SPLIT include/autoconf.h -> include/config/*

patching file include/linux/clockchips.h

patching file include/linux/hardirq.h

patching file include/linux/ipipe_base.h

patching file include/linux/ipipe_compat.h

patching file include/linux/ipipe.h

patching file include/linux/ipipe_percpu.h

patching file include/linux/ipipe_tickdev.h

patching file include/linux/ipipe_trace.h

patching file include/linux/irq.h

patching file include/linux/kernel.h

patching file include/linux/linkage.h

patching file include/linux/mm.h

patching file include/linux/preempt.h

patching file include/linux/sched.h

patching file include/linux/spinlock.h

patching file include/linux/spinlock_types.h

patching file init/Kconfig

patching file init/main.c

GEN include/bbconfigopts.h

patching file kernel/exit.c

patching file kernel/fork.c

patching file kernel/ipipe/core.c

patching file kernel/ipipe/Kconfig

patching file kernel/ipipe/Kconfig.debug

patching file kernel/ipipe/Makefile

patching file kernel/ipipe/tracer.c

patching file kernel/irq/chip.c

patching file kernel/irq/manage.c

patching file kernel/Makefile

patching file kernel/power/swsusp.c

patching file kernel/printk.c

patching file kernel/sched.c

patching file kernel/signal.c

patching file kernel/spinlock.c

patching file kernel/time/clockevents.c

patching file lib/bust_spinlocks.c

patching file lib/ioremap.c

patching file lib/Kconfig.debug

patching file lib/smp_processor_id.c

patching file lib/spinlock_debug.c

patching file Makefile

patching file mm/memory.c

patching file mm/mlock.c

patching file mm/vmalloc.c

prepare-kernel.sh: Unable to patch kernel 2.6.22.19 with adeos-bfin.patch.

make[3]: *** [xeno_patch] Error 2

make[3]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user/xenomai'

make[2]: *** [xenomai] Error 2

make[2]: *** Waiting for unfinished jobs....

make[3]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user/busybox'

make[2]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user'

make[1]: *** [all] Error 2

make[1]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user'

make: *** [subdirs] Error 1

Follow-ups

--- Yi Li 2008-05-26 06:22:51

fixed.

--- Mingquan Pan 2008-05-27 22:19:25

Yes.close.

Files

Changes

Commits

Dependencies

Duplicates

Associations