[microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header for flattened device tree representation

[Grant Likely]

On Wed, Oct 7, 2009 at 6:14 AM, Michal Simek <monstr at monstr.eu> wrote:
>
>
> Stephen Rothwell wrote:
>> Hi Grant,
>>
>> Just first obvious thing:
>>
>> On Tue, 06 Oct 2009 22:30:59 -0600 Grant Likely <grant.likely at secretlab.ca> wrote:
>>> diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
>>> index 64e8b3a..5f461f0 100644
>>> --- a/arch/microblaze/include/asm/prom.h
>>> +++ b/arch/microblaze/include/asm/prom.h
>>> @@ -17,20 +17,10 @@
>>>  #ifndef _ASM_MICROBLAZE_PROM_H
>>>  #define _ASM_MICROBLAZE_PROM_H
>>>  #ifdef __KERNEL__
>>> -
>>> -/* Definitions used by the flattened device tree */
>>> -#define OF_DT_HEADER                0xd00dfeed /* marker */
>>
>> This is used in arch/microblaze/kernel/head.S, but you move its
>> definition inside "#ifndef __ASSEMBLY__" below.  You should probably
>> replace the include of asm/prom.h in arch/microblaze/kernel/head.S with
>> linux/of_fdt.h (assuming that the comment in there is correct).
>
> yes, Stephen is right here. I created one patch (in attachment) which fixed it. I tested your
> patches on Microblaze (noMMU and MMU) and I have no problem with compilation and simple boot-up
> works for both versions too.
>
> With that my patch: Acked-by: Michal Simek <monstr at monstr.eu>

Thanks.  I'll merge your change with my patch so that bisect isn't broken.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.