[U-Boot] [PATCH] powerpc: Correct build warning introduced by getenv_ulong() patch

[Simon Glass]

Hi Mike,

On Sun, Oct 30, 2011 at 5:47 PM, Mike Frysinger <vapier at gentoo.org> wrote:
> On Sunday 23 October 2011 23:41:54 Simon Glass wrote:
>> --- a/arch/powerpc/lib/board.c
>> +++ b/arch/powerpc/lib/board.c
>>
>>   */
>>  void board_init_r (gd_t *id, ulong dest_addr)
>>  {
>> -     char *s;
>>       bd_t *bd;
>>       ulong malloc_start;
>>
>> @@ -727,6 +726,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
>>               flash_size = 0;
>>       } else if ((flash_size = flash_init ()) > 0) {
>>  # ifdef CONFIG_SYS_FLASH_CHECKSUM
>> +             char *s;
>> +
>>               print_size (flash_size, "");
>>               /*
>>                * Compute and print flash CRC if flashchecksum is set to 'y'
>> @@ -927,8 +928,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
>>       /* Initialize from environment */
>>       load_addr = getenv_ulong("loadaddr", 16, load_addr);
>>  #if defined(CONFIG_CMD_NET)
>> -     if ((s = getenv ("bootfile")) != NULL) {
>> -             copy_filename (BootFile, s, sizeof (BootFile));
>> +     {
>> +             char *s = getenv("bootfile");
>> +
>> +             if (s != NULL)
>> +                     copy_filename(BootFile, s, sizeof(BootFile));
>>       }
>>  #endif
>
> same feedback here wrt using __maybe_unused and marking things const ...
> -mike
>

I might leave that alone for now, at least until I get back to the
board.c side of things. It was just a warning fix, and I feel that
board_init_r() is too long and should not do so many things.

Regards,
Simon