Hi, I don't know where do you from my vendor kernel but it seems that it is a 2.6.32 kernel. This is my first time with git ! so I will need that you valid my method, please.
I test with these commands : #git clone git://git.denx.de/ipipe-2.6.git #git checkout -branch -b ipipe-2.6.32-noarch origin/ipipe-2.6.32-noarch #git checkout -b vendor #cp -vR ../TI_linux/* ./ #git add * #git commit #git checkout ipipe-2.6.32-noarch #git merge vendor --> no error, no warning #git checkout -branch -b ipipe-2.6.31-noarch origin/ipipe-2.6.31-noarch #git checkout -branch -b ipipe-2.6.31-arm origin/ipipe-2.6.31-arm #git checkout ipipe-2.6.32-noarch #cat ../result.patch | patch -p1 #find . -name '*.reji' ./arch/arm/mach-sa1100/time.c.rej ./arch/arm/plat-mxc/gpio.c.rej ./arch/arm/mach-omap2/irq.c.rej ./arch/arm/mach-omap2/timer-gp.c.rej ./arch/arm/Kconfig.rej ./arch/arm/kernel/entry-common.S.rej ./arch/arm/kernel/smp.c.rej ./arch/arm/kernel/Makefile.rej ./arch/arm/kernel/entry-armv.S.rej ./arch/arm/kernel/entry-header.S.rej ./arch/arm/vfp/vfpmodule.c.rej ./arch/arm/mach-at91/at91sam9261.c.rej ./arch/arm/include/asm/mmu_context.h.rej ./arch/arm/include/asm/cacheflush.h.rej ./arch/arm/include/asm/thread_info.h.rej ./arch/arm/mm/Kconfig.rej ./arch/arm/mm/flush.c.rej I will try to resolve manualy these rejectfile : ./arch/arm/mach-omap2/irq.c.rej ./arch/arm/mach-omap2/timer-gp.c.rej ./arch/arm/Kconfig.rej ./arch/arm/kernel/entry-common.S.rej ./arch/arm/kernel/smp.c.rej ./arch/arm/kernel/Makefile.rej ./arch/arm/kernel/entry-armv.S.rej ./arch/arm/kernel/entry-header.S.rej ./arch/arm/vfp/vfpmodule.c.rej ./arch/arm/include/asm/mmu_context.h.rej ./arch/arm/include/asm/cacheflush.h.rej ./arch/arm/include/asm/thread_info.h.rej ./arch/arm/mm/Kconfig.rej ./arch/arm/mm/flush.c.rej 2010/8/19 Gilles Chanteperdrix <[email protected]>: > marc doz wrote: >> The compilation is a sucess without the line 172 and 193. It seem that >> spin lock management is different between kernel 2.6.32 ans 2.6.33. >> >> So I think that my realy problem is that is need a adeos patch for >> kernel 2.6.32 adeos-ipipe-2.6.32-arm* . I have 298 patchs of Texas >> Instrument for the kernel 2.6.32 and my board. So I can't upgrade to >> 2.6.33 or downgrade to 2.6.31. >> >> The 2.6.32 adeos-ipipe-2.6.32-arm* patch is not present in the >> downloading section of the adeos website > > Yes, I did not produce this patch. If you want to do it, you should use > the I-pipe git: git://git.denx.de/ipipe-2.6.git, then merge the > ipipe-2.6.32-noarch branch with your vendor branch, then try and apply > the diff between ipipe-2.6.31-noarch and ipipe-2.6.31-arm or > ipipe-2.6.33-noarch and ipipe-2.6.33-arm. > > -- > Gilles. > regards, Marc _______________________________________________ Xenomai-help mailing list [email protected] https://mail.gna.org/listinfo/xenomai-help
