2007-03-05 08:31:38     Xenomai/Adeos patchin problem

Document created by Aaronwu Employee on Aug 11, 2013
Version 1Show Document
  • View in full screen mode

2007-03-05 08:31:38     Xenomai/Adeos patchin problem

Arne Jan Dahl (NORWAY)

Message: 23003    I have problems patching Xenomai/Adeos with my version of uCLinux:

 

[AJD@localhost xenomai-2.3.0]$ /home/AJD/bfin/xenomai-2.3.0/scripts/prepare-kernel.sh --arch=blackfin --adeos=/home/AJD/bfin/xenomai-2.2.5/ksrc/arch/blackfin/patches/adeos-ipipe-R06R1RC2-bf53x-1.4-03.patch --linux=/home/AJD/bfin/uClinux-dist-R06R2-RC2/linux-2.6.x

patching file arch/blackfin/Kconfig

Hunk #1 succeeded at 748 with fuzz 1 (offset 157 lines).

patching file arch/blackfin/Makefile

Hunk #2 FAILED at 82.

1 out of 2 hunks FAILED -- saving rejects to file arch/blackfin/Makefile.rej

patching file arch/blackfin/kernel/Makefile

Hunk #1 FAILED at 7.

1 out of 1 hunk FAILED -- saving rejects to file arch/blackfin/kernel/Makefile.rej

patching file arch/blackfin/kernel/entry.S

Hunk #1 FAILED at 5.

Hunk #2 succeeded at 37 with fuzz 1 (offset -10 lines).

1 out of 2 hunks FAILED -- saving rejects to file arch/blackfin/kernel/entry.S.rej

patching file arch/blackfin/kernel/ipipe-core.c

patching file arch/blackfin/kernel/ipipe-root.c

patching file arch/blackfin/kernel/irqchip.c

Hunk #1 FAILED at 6.

Hunk #2 succeeded at 53 (offset -9 lines).

Hunk #4 succeeded at 317 (offset -9 lines).

Hunk #6 succeeded at 426 (offset -9 lines).

Hunk #8 succeeded at 489 (offset -9 lines).

Hunk #9 succeeded at 586 with fuzz 2.

Hunk #10 succeeded at 588 (offset -8 lines).

1 out of 11 hunks FAILED -- saving rejects to file arch/blackfin/kernel/irqchip.c.rej

patching file arch/blackfin/kernel/process.c

Hunk #1 FAILED at 7.

Hunk #2 FAILED at 61.

2 out of 2 hunks FAILED -- saving rejects to file arch/blackfin/kernel/process.c.rej

patching file arch/blackfin/kernel/time.c

Hunk #1 FAILED at 142.

Hunk #2 FAILED at 178.

Hunk #3 FAILED at 193.

3 out of 3 hunks FAILED -- saving rejects to file arch/blackfin/kernel/time.c.rej

patching file arch/blackfin/kernel/traps.c

Hunk #1 FAILED at 6.

Hunk #2 FAILED at 240.

Hunk #3 FAILED at 249.

3 out of 3 hunks FAILED -- saving rejects to file arch/blackfin/kernel/traps.c.rej

patching file arch/blackfin/lib/ins.S

Hunk #1 FAILED at 1.

Hunk #2 succeeded at 38 (offset 7 lines).

Hunk #3 FAILED at 55.

Hunk #4 FAILED at 86.

3 out of 4 hunks FAILED -- saving rejects to file arch/blackfin/lib/ins.S.rej

patching file arch/blackfin/mach-bf533/Kconfig

Hunk #1 FAILED at 60.

1 out of 1 hunk FAILED -- saving rejects to file arch/blackfin/mach-bf533/Kconfig.rej

patching file arch/blackfin/mach-bf537/Kconfig

Hunk #1 FAILED at 83.

1 out of 1 hunk FAILED -- saving rejects to file arch/blackfin/mach-bf537/Kconfig.rej

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

Hunk #1 FAILED at 307.

Hunk #2 succeeded at 405 (offset 22 lines).

Hunk #3 FAILED at 499.

Hunk #4 FAILED at 606.

Hunk #5 FAILED at 709.

4 out of 5 hunks FAILED -- saving rejects to file arch/blackfin/mach-common/entry.S.rej

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

Hunk #1 FAILED at 39.

Hunk #2 FAILED at 182.

Hunk #3 FAILED at 223.

Hunk #4 FAILED at 234.

Hunk #5 FAILED at 245.

Hunk #6 FAILED at 256.

Hunk #7 FAILED at 267.

Hunk #8 FAILED at 278.

Hunk #9 FAILED at 289.

9 out of 9 hunks FAILED -- saving rejects to file arch/blackfin/mach-common/interrupt.S.rej

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

Hunk #1 FAILED at 6.

Hunk #2 succeeded at 132 (offset 3 lines).

Hunk #4 succeeded at 168 (offset 5 lines).

Hunk #5 FAILED at 200.

Hunk #6 FAILED at 278.

Hunk #7 succeeded at 944 (offset 361 lines).

3 out of 7 hunks FAILED -- saving rejects to file arch/blackfin/mach-common/ints-priority-sc.c.rej

patching file include/asm-blackfin/bitops.h

patching file include/asm-blackfin/ipipe.h

patching file include/asm-blackfin/irqchip.h

patching file include/asm-blackfin/system.h

Hunk #1 succeeded at 46 with fuzz 2 (offset 10 lines).

Hunk #2 succeeded at 183 (offset 17 lines).

Hunk #3 succeeded at 223 (offset 10 lines).

Hunk #4 succeeded at 252 (offset 17 lines).

Hunk #5 succeeded at 260 (offset 10 lines).

Hunk #6 succeeded at 298 (offset 17 lines).

patching file include/linux/hardirq.h

patching file include/linux/ipipe.h

patching file include/linux/preempt.h

patching file include/linux/sched.h

patching file init/Kconfig

patching file init/main.c

patching file kernel/Makefile

patching file kernel/exit.c

Hunk #1 succeeded at 844 (offset -8 lines).

patching file kernel/fork.c

patching file kernel/ipipe/Kconfig

patching file kernel/ipipe/Makefile

patching file kernel/ipipe/core.c

patching file kernel/ipipe/generic.c

patching file kernel/irq/handle.c

patching file kernel/printk.c

patching file kernel/sched.c

patching file kernel/signal.c

patching file lib/smp_processor_id.c

patching file lib/spinlock_debug.c

prepare-kernel.sh: Unable to patch kernel 2.6.16.27 with adeos-ipipe-R06R1RC2-bf53x-1.4-03.patch.

[AJD@localhost xenomai-2.3.0]$   

 

 

Is this cased by mismatch in versions?

QuoteReplyEditDelete

 

 

2007-03-05 22:54:52     Re: Xenomai/Adeos patchin problem

Yi Li (CHINA)

Message: 23025    Yes. This is caused by mismatch in kernel and adeos version.

 

In the xenomai latest stable release, it contains two patches:

 

In xenomai-2.3.0/ksrc/arch/blackfin/patches/

adeos-ipipe-bf53x-CVS-20061215-1.6-00.patch  README

adeos-ipipe-R06R1RC2-bf53x-1.4-03.patch

 

As the name indicated, one patch is for 20061215 SVN head, one is for 2006-R1-rc2 release.

 

In your case, you are using 2006-R2-RC2 kernel, you can find patch for it in

uclinux-dist/bfin_patch/adeos_patch/adeos-bfin-cvs.patch. If you read the README, it is based on 06r2 kernel.  This directory is updated when we make a kernel release.

 

QuoteReplyEditDelete

 

 

2007-03-06 15:37:53     Re: Xenomai/Adeos patchin problem

Arne Jan Dahl (NORWAY)

Message: 23115    Thank you for leading me in the right direction.

 

However. After pathcing and compiling the boot hangs:

 

Bytes transferred = 10602154 (a1c6aa hex)

Loading .text @ 0x00001000 (1429592 bytes)

Loading .init @ 0x0015e058 (62608 bytes)

Loading .text_l1 @ 0xffa00000 (1768 bytes)

sh_addr: FFA00000, p_paddr: 0016D4E8

Loading from: 0116E000 to 0016D4E8, size: 1768

Loading .data @ 0x0016dbd0 (225892 bytes)

Clearing .bss @ 0x001a4e40 (163764 bytes)

Loading .romfs @ 0x001ccdf4 (8388608 bytes)

## Starting application at 0x00001000 ...

 

If I use a kernel without Xenomai it boots ok. Is there a setting I have missed?

QuoteReplyEditDelete

 

 

2007-03-07 01:47:53     Re: Re: Xenomai/Adeos patchin problem

Yi Li (CHINA)

Message: 23130    I have a try on a BF537 STAMP and it works well. Here is what I am

doing.

 

1. Download xenomai-2.3.0.

2. Get uClinux-dist-06r2-rc2.

3. ./prepare-kernel.sh --arch=blackfin

--adeos=/home/test/uClinux-dist-06r2-rc2/bfin_patch/adeos_patch/adeos-bfin-cvs.patch --linux=/home/test/uClinux-dist-06r2-rc2/linux-2.6.x

4. Build with toolchain-06r2-rc5 GCC-4.1

 

Please make check you kernel and toolchain version.

 

I will update the wiki document to describe these ADEOS patches, to

clarify confusions.

 

QuoteReplyEditDelete

 

 

2007-03-07 02:44:45     Re: Re: Xenomai/Adeos patchin problem

Arne Jan Dahl (NORWAY)

Message: 23131    I just dicovered that all settings in menuconfig was set back to default. After changing memory config it boots ok again.

 

Thanks.

QuoteReplyEditDelete

 

 

2007-03-07 02:57:56     Re: Re: Re: Xenomai/Adeos patchin problem

Yi Li (CHINA)

Message: 23132    If you would like to try the ipipe-tracer (a tracing tool), you may also

find the patch bfin_patch/adeos_patch/adeos-bfin-06r2.patch in SVN (it

is not included in the 06r2 kernel release).

 

QuoteReplyEditDelete

 

 

2009-02-05 12:30:27     Re: Xenomai/Adeos patchin problem

Michael McTernan (UNITED KINGDOM)

Message: 68924   

 

Why don't you try the 2008R1 or R1.5 release?  It's part of the package and works okay there.  There are a couple of gotchas, namely:

 

- you should patch with the blackfin patch under uClinux-dist-2008R1.5-RC3/bfin_patch/adeos_patch/, the one in the Xenomai directory will fail

 

- if you select Xenomai in the Misc applications menu of the vendor settings, you'll get the tests auto built into the system image, you don't need to the other steps on the docs page.

 

- a make clean will try to un-patch the kernel which may or maynot be what you want (you can just edit the user/xenomai/Makefile to remove the patch commands under the clean target.

 

HTH,

 

Mike

Attachments

    Outcomes