[U-Boot] Pull request: u-boot-blackfin

[Sonic Zhang]

Hi Tom,

On Wed, Aug 6, 2014 at 8:38 PM, Tom Rini <trini at ti.com> wrote:
> On Mon, Aug 04, 2014 at 09:56:45AM +0800, Sonic Zhang wrote:
>
>> Hi Tom,
>>
>> Please pull the following patches for Blackfin from u-boot-blackfin
>> into your tree.
>>
>> Thanks
>>
>> Sonic Zhang
>>
>> The following changes since commit e1b362f4425209d836f230a872ef2bf04b45de27:
>>
>>   boards.cfg : Add maintainers entries for SOCFPGA (2014-07-29 11:51:03 -0400)
>>
>> are available in the git repository at:
>>
>>   git://git.denx.de/u-boot-blackfin.git master
>>
>> for you to fetch changes up to 97cd2735b279068037013426977c44f45a8d5151:
>>
>>   support blackfin board initialization in generic board_f (2014-08-01
>> 18:21:45 +0800)
>>
>> ----------------------------------------------------------------
>> Aaron Wu (1):
>>       bfin: add register define required by core B on dual core BF609 processor
>>
>> Scott Jiang (1):
>>       blackfin: spi clock is in sysclk1 domain instead of sysclk0
>>
>> Sonic Zhang (2):
>>       blackfin: convert blackfin board_f and board_r to use generic
>> board init functions
>>       support blackfin board initialization in generic board_f
>>
>>  arch/blackfin/config.mk                          |   3 +
>>  arch/blackfin/cpu/cpu.c                          | 333 +++++++++++++++--
>>  arch/blackfin/cpu/start.S                        |  14 +-
>>  arch/blackfin/cpu/u-boot.lds                     |   4 +-
>>  arch/blackfin/include/asm/clock.h                |   2 +-
>>  arch/blackfin/include/asm/mach-bf609/BF609_def.h |   2 +
>>  arch/blackfin/include/asm/u-boot.h               |   3 +
>>  arch/blackfin/lib/Makefile                       |   7 +-
>>  arch/blackfin/lib/board.c                        | 443 -----------------------
>>  arch/blackfin/lib/sections.c                     |  11 +
>>  common/board_f.c                                 |  35 +-
>>  include/configs/bfin_adi_common.h                |   4 +
>>  include/watchdog.h                               |   2 +-
>>  13 files changed, 366 insertions(+), 497 deletions(-)
>>  delete mode 100644 arch/blackfin/lib/board.c
>>  create mode 100644 arch/blackfin/lib/sections.c
>
> With this applied, MAKEALL -a blackfin fails for a number of boards.  In
> addition, this also breaks m68k as they haven't switched over to generic
> board yet and need:

The u-boot image sizes for some blackfin boards exceed the limit after
converting to the generic board. I will fix the config files.

>
> diff --git a/include/watchdog.h b/include/watchdog.h
> index 174c894..9273fa1 100644
> --- a/include/watchdog.h
> +++ b/include/watchdog.h
> @@ -21,7 +21,8 @@
>  int init_func_watchdog_reset(void);
>  #endif
>
> -#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
> +#if defined(CONFIG_SYS_GENERIC_BOARD) && \
> +       (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG))
>  #define INIT_FUNC_WATCHDOG_INIT        init_func_watchdog_init,
>  #define INIT_FUNC_WATCHDOG_RESET       init_func_watchdog_reset,
>  #else
>

OK. I will add your suggestion to the v4 patch.

Thank you for your review.

Sonic Zhang