Re: [Xenomai] Compiling I-pipe patched kernel on beaglebone from Angstrom branch

[Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>]

On 12/03/2012 07:30 PM, WONG Sheng Chao wrote:

> On Mon, 03 Dec 2012 15:31:20 +0100, WONG Sheng Chao wrote:
>> On Sun, 02 Dec 2012 17:14:37 +0100, Gilles Chanteperdrix wrote:
>>> On 12/02/2012 04:15 PM, WONG Sheng Chao wrote:
>>>
>>>> On Sun, 02 Dec 2012 15:45:56 +0100, Gilles Chanteperdrix wrote:
>>>>> On 12/02/2012 02:53 PM, WONG Sheng Chao wrote:
>>>>>
>>>>>> On Fri, 30 Nov 2012 20:22:11 +0100, Michael Haberler wrote:
>>>>>>> Am 30.11.2012 um 14:42 schrieb Gilles Chanteperdrix:
>>>>>>>
>>>>>>>> On 11/30/2012 12:45 PM, Michael Haberler wrote:
>>>>>>>>>
>>>>>>>>> Am 30.11.2012 um 09:54 schrieb WONG Sheng Chao:
>>>>>>>>>
>>>>>>>>>> On Thu, 29 Nov 2012 13:16:31 +0100, Stephan Kappertz wrote:
>>>>>>>>>>>
>>>>>>>>>>> The problem is that you are using the wrong timer.
>>>>>>>>>>> ...
>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> #endif
>>>>>>>>>>>
>>>>>>>>>>> - Stephan
>>>>>>>>>>
>>>>>>>>>> Thanks a lot Stephan and Gilles! The kernel is now able to 
>>>>>>>>>> boot
>>>>>>>>>> with both CONFIG_XENOMAI and CONFIG_IPIPE.
>>>>>>>>>
>>>>>>>>> great! could you publish a complete patch relative to a known
>>>>>>>>> base?
>>>>>>>>>
>>>>>>>>> thanks in advance,
>>>>>>>>
>>>>>>>> As I already said, if someone takes the little time it takes to
>>>>>>>> generate
>>>>>>>> a pre and post patch (I explained the why and how in a previous
>>>>>>>> mail),
>>>>>>>> we can even integrate it in xenomai repository.
>>>>>>
>>>>>> I am trying to generate the pre and post patch following the
>>>>>> instructions from this mail
>>>>>>
>>>>>>
>>>>>> http://www.xenomai.org/pipermail/xenomai/2012-September/026190.html
>>>>>>
>>>>>> But I am still not clear on the pre-patch part especially this 
>>>>>> part
>>>>>> of
>>>>>> the mail
>>>>>>
>>>>>> The pre-patch is the reverse diff between the files in the 
>>>>>> vanilla
>>>>>> kernel,
>>>>>> and the files conflicting in the vendor branch.
>>>>>> Generate the pre-patch.
>>>>>> git reset --hard
>>>>>> git clean -df (beware this erases all files non commited in git, 
>>>>>> so
>>>>>> do
>>>>>> not do that if you keep precious files not under git control)
>>>>>>
>>>>>>
>>>>>>  From what I understand so far, the steps to make the pre and 
>>>>>> post
>>>>>> patch
>>>>>> are as follow
>>>>>>
>>>>>> 1) Make a copy of the original_vendor_kernel_source and run git
>>>>>> commit.
>>>>>>
>>>>>> 2) I ran the i-pipe patch from xenomai/scripts with the 
>>>>>> linux_tree
>>>>>> pointing to the original_vender_kernel_source to check for the
>>>>>> conflicting files.
>>>>>
>>>>>
>>>>> No, the pre and post patches are I-pipe only, they do not include
>>>>> Xenomai.
>>>>
>>>> So for step 2, I should copy the ipipe-core-3.2.21-arm-1.patch to 
>>>> my
>>>> original_vendor_kernel_source folder and run
>>>>
>>>> patch --dry-run -p1 -i ipipe-core-3.2.21-arm-1.patch
>>>>
>>>> to check for conflicting files?
>>>
>>>
>>> I do not know what -i means, but yes, that is what you should do.
>>
>> Here are the pre and post patch that I made to make Xenomai run on my
>> beaglebone.
>>
>> The general workflow that I took was as follow
>>
>> 1) Clone the setup-script from below and run the update script
>>
>> git clone git://github.com/Angstrom-distribution/setup-scripts.git
>>
>> 2) Edit the bitbake recipe to download the kernel source of linux
>> 3.2.21 and the rest of the meta patch.
>>
>> 3) Apply the pre-patch
>>
>> 4) Apply the ipipe patch as usual with the ./prepare-kernel.sh script
>>
>> 5) Apply the post-patch
>>
>> 6) Copy the am335x-pm-firmware.bin to the /firmware folder, this is
>> needed to compile the kernel for AM3359
>>
>> 7) Compile the kernel
>>
>>
>>
>> -------------- next part --------------
>> A non-text attachment was scrubbed...
>> Name: pre-patch.patch
>> Type: text/x-c
>> Size: 16458 bytes
>> Desc: not available
>> URL:
>>
>> <http://www.xenomai.org/pipermail/xenomai/attachments/20121203/fa85d30d/attachment.bin>
>> -------------- next part --------------
>> An embedded and charset-unspecified text was scrubbed...
>> Name: post-patch.patch
>> URL:
>>
>> <http://www.xenomai.org/pipermail/xenomai/attachments/20121203/fa85d30d/attachment.ksh>
>> _______________________________________________
>> Xenomai mailing list
>> Xenomai@xenomai.org
>> http://www.xenomai.org/mailman/listinfo/xenomai
> 
> 
> 
> post and pre patches resent in attachment


The first post was just fine. But two things:
- we do not want the .config in the post patch
- the post patch does not re-add the changes removed by the pre-patch in
arch/arm/common/gic.c, which makes it look really suspicious.

-- 
                                                                Gilles.