[U-Boot] [PATCH 2/2] support blackfin board initialization in generic board_f

Sonic Zhang sonic.adi at gmail.com
Wed Jul 30 07:40:17 CEST 2014


Hi Tom,

On Tue, Jul 29, 2014 at 8:33 PM, Tom Rini <trini at ti.com> wrote:
> On Thu, Jul 24, 2014 at 10:47:02AM +0800, Sonic Zhang wrote:
>> From: Sonic Zhang <sonic.zhang at analog.com>
>>
>> - init hardware watchdog if applicable
>> - use CONFIG_SYS_MONITOR_LEN as the gd monitor len for Blackfin
>> - reserve u-boot memory at the top field of the RAM for Blackfin
>> - avoid refer to CONFIG_SYS_MONITOR_LEN, which is not defined by Blackfin
>>
>> Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
>> ---
>>
>>  common/board_f.c | 19 ++++++++++++++++++-
>>  1 file changed, 18 insertions(+), 1 deletion(-)
>>
>> diff --git a/common/board_f.c b/common/board_f.c
>> index bdab38e..079e1fa 100644
>> --- a/common/board_f.c
>> +++ b/common/board_f.c
>> @@ -107,6 +107,9 @@ __weak void blue_led_off(void) {}
>>  #if defined(CONFIG_WATCHDOG)
>>  static int init_func_watchdog_init(void)
>>  {
>> +#ifdef CONFIG_HW_WATCHDOG
>> +     hw_watchdog_init();
>> +#endif
>>       puts("       Watchdog enabled\n");
>>       WATCHDOG_RESET();
>>
>
> So today we're inconsistent about hw_watchdog_init.  For ARM this is
> done at the board level, for blackfin/m68k as you've noted it's done in
> board_init_f, which makes sense I believe.  But we need to get folks to
> test the conversion over, so for now make this CONFIG_HW_WATCHDOG &&
> (BLACKFIN || M68K || MICROBLAZE || SH) and we'll get everyone converted
> when we can.

OK. I will add these dependency to the patch.

>
>> @@ -144,7 +147,11 @@ static int display_text_info(void)
>>       bss_end = (ulong)&__bss_end;
>>
>>       debug("U-Boot code: %08X -> %08lX  BSS: -> %08lX\n",
>> +#ifdef CONFIG_SYS_TEXT_BASE
>>             CONFIG_SYS_TEXT_BASE, bss_start, bss_end);
>> +#else
>> +           CONFIG_SYS_MONITOR_BASE, bss_start, bss_end);
>> +#endif
>>  #endif
>
> These aren't the same for you?
>

According to Mike's patch in 2010, CONFIG_SYS_TEXT_BASE is not used in
Blackfin boards.

commit fbb21ff0478f1bac0b009133bf82b7412ea0230b
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Thu Dec 23 14:13:41 2010 -0500

    Blackfin: drop CONFIG_SYS_TEXT_BASE from boards

    We don't want/use this value for Blackfin boards, so punt it and have the
    common code error out when people try to use it.

    Signed-off-by: Mike Frysinger <vapier at gentoo.org>



Thanks,

Sonic


More information about the U-Boot mailing list