[U-Boot] env_mmc: Fix crashing bug encountered after enabling ARM relocation

Steve Sakoman sakoman at gmail.com
Sun Oct 10 22:08:46 CEST 2010


On Sun, Oct 10, 2010 at 8:53 AM, Sergei Shtylyov <sshtylyov at mvista.com> wrote:
> On 10-10-2010 19:47, Steve Sakoman wrote:
>
>>>>>> The crash was occuring in env_relocate because it was being called
>>>>>> prior
>>>>>> to mmc_initialize.  This patch moves the MMC initialization earlier in
>>>>>> the init process.
>
>>>>>> This patch also cleans up the env_relocate_spec code in env_mmc.c
>
>>>>>> Developed jointly with Stefano Babic
>
>>>>>> Signed-off-by: Steve Sakoman<steve.sakoman at linaro.org>
>>>>>> ---
>
>>>>>> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
>>>>>> index 5f2dfd0..0e2f129 100644
>>>>>> --- a/arch/arm/lib/board.c
>>>>>> +++ b/arch/arm/lib/board.c
>>>>>> @@ -779,6 +779,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
>>>>>>       onenand_init();
>>>>>>   #endif
>>>>>>
>>>>>> +#ifdef CONFIG_GENERIC_MMC
>>>>>> +       puts ("MMC:   ");
>>>>>> +       mmc_initialize (bd);
>
>>>>>    This would cause checkpatch.pl to complain -- no spaces allowed
>>>>> before
>>>>> (.
>
>>>> I  will resubmit a V2 with that change as well as Stefano's
>>>> Signed-off-by
>
>>>   You've posted V2 with Stefano's ACK... and this line unchanged. :-)
>
>> ???
>
>> +#ifdef CONFIG_GENERIC_MMC
>> +       puts("MMC:   ");
>> +       mmc_initialize (bd);
>> +#endif
>> +
>
>> It looks changed to me!
>
>   Indeed, I have ovelooked that first line under #ifdef was changed. But not
> the second. ;-)

Sigh.  You are correct!

I hate these older files that were done when "space before paren" was
the rule.  You have to be really careful when cutting and pasting, and
even then you end up with a source file that is totally inconsistent
in spacing unless you go and fix the entire file!

I will submit a v3.

Steve


More information about the U-Boot mailing list