Patchwork [U-Boot] Pull request: u-boot-sh/master

login
register
mail settings
Submitter Nobuhiro Iwamatsu
Date Jan. 9, 2014, 4:49 a.m.
Message ID <CABMQnVL7VMB=QSSyRyR-2kb_RsJw5t0ntrHhUXa_62OQoFJZUw@mail.gmail.com>
Download mbox
Permalink /patch/308503/
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-sh.git master

Comments

Nobuhiro Iwamatsu - Jan. 9, 2014, 4:49 a.m.
Dear Tom Rini.

Please pull u-boot-sh master branch.

The following changes since commit e7be18225fbea76d1f0034b224f0d1e60f07cfcf:

  Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
(2014-01-06 14:07:08 -0500)

are available in the git repository at:


  git://git.denx.de/u-boot-sh.git master

for you to fetch changes up to 5fe3aefd3dd0845ed4f69ba34b9790d3961d7ea8:

  sh: sh2: Remove CONFIG_SH2A definition from asm/processor.h
(2014-01-09 13:22:22 +0900)

----------------------------------------------------------------
Masahiro Yamada (1):
      sh: delete redundant CONFIG_SH definition

Nobuhiro Iwamatsu (9):
      sh: sh2: Add CONFIG_SH2 definition to config.mk of SH2
      sh: sh2: remove CONFIG_SH2 definition from board config
      sh: sh3: Add CONFIG_SH3 definition to config.mk of SH3
      sh: sh3: remove CONFIG_SH3 definition from board config
      sh: sh4: Add CONFIG_SH4 definition to config.mk of SH4
      sh: sh4: remove CONFIG_SH4 definition from board config
      sh: sh2: Change CONFIG_SYS_HZ to CONFIG_SH_CMT_CLK_FREQ
      sh: sh4: Remove CONFIG_SH4A definition from source code
      sh: sh2: Remove CONFIG_SH2A definition from asm/processor.h

 arch/sh/cpu/sh2/config.mk       | 2 +-
 arch/sh/cpu/sh2/cpu.c           | 4 ----
 arch/sh/cpu/sh3/config.mk       | 2 +-
 arch/sh/cpu/sh4/config.mk       | 2 +-
 arch/sh/cpu/sh4/cpu.c           | 4 ----
 arch/sh/include/asm/cache.h     | 4 ++--
 arch/sh/include/asm/processor.h | 8 +++-----
 arch/sh/lib/time_sh2.c          | 2 +-
 include/configs/MigoR.h         | 2 --
 include/configs/ap325rxa.h      | 2 --
 include/configs/ap_sh4a_4a.h    | 3 ---
 include/configs/ecovec.h        | 3 ---
 include/configs/espt.h          | 2 --
 include/configs/mpr2.h          | 2 --
 include/configs/ms7720se.h      | 2 --
 include/configs/ms7722se.h      | 2 --
 include/configs/ms7750se.h      | 2 --
 include/configs/r0p7734.h       | 3 ---
 include/configs/r2dplus.h       | 2 --
 include/configs/r7780mp.h       | 2 --
 include/configs/rsk7203.h       | 4 +---
 include/configs/rsk7264.h       | 4 +---
 include/configs/rsk7269.h       | 4 +---
 include/configs/sh7752evb.h     | 2 --
 include/configs/sh7753evb.h     | 2 --
 include/configs/sh7757lcr.h     | 2 --
 include/configs/sh7763rdp.h     | 2 --
 include/configs/sh7785lcr.h     | 2 --
 include/configs/shmin.h         | 2 --
 include/sh_tmu.h                | 2 +-
Tom Rini - Jan. 10, 2014, 8:03 p.m.
On Thu, Jan 09, 2014 at 01:49:19PM +0900, Nobuhiro Iwamatsu wrote:

> Dear Tom Rini.
> 
> Please pull u-boot-sh master branch.
> 
> The following changes since commit e7be18225fbea76d1f0034b224f0d1e60f07cfcf:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
> (2014-01-06 14:07:08 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-sh.git master
> 
> for you to fetch changes up to 5fe3aefd3dd0845ed4f69ba34b9790d3961d7ea8:
> 
>   sh: sh2: Remove CONFIG_SH2A definition from asm/processor.h
> (2014-01-09 13:22:22 +0900)
> 
> ----------------------------------------------------------------
> Masahiro Yamada (1):
>       sh: delete redundant CONFIG_SH definition
> 
> Nobuhiro Iwamatsu (9):
>       sh: sh2: Add CONFIG_SH2 definition to config.mk of SH2
>       sh: sh2: remove CONFIG_SH2 definition from board config
>       sh: sh3: Add CONFIG_SH3 definition to config.mk of SH3
>       sh: sh3: remove CONFIG_SH3 definition from board config
>       sh: sh4: Add CONFIG_SH4 definition to config.mk of SH4
>       sh: sh4: remove CONFIG_SH4 definition from board config
>       sh: sh2: Change CONFIG_SYS_HZ to CONFIG_SH_CMT_CLK_FREQ
>       sh: sh4: Remove CONFIG_SH4A definition from source code
>       sh: sh2: Remove CONFIG_SH2A definition from asm/processor.h
> 
>  arch/sh/cpu/sh2/config.mk       | 2 +-
>  arch/sh/cpu/sh2/cpu.c           | 4 ----
>  arch/sh/cpu/sh3/config.mk       | 2 +-
>  arch/sh/cpu/sh4/config.mk       | 2 +-
>  arch/sh/cpu/sh4/cpu.c           | 4 ----
>  arch/sh/include/asm/cache.h     | 4 ++--
>  arch/sh/include/asm/processor.h | 8 +++-----
>  arch/sh/lib/time_sh2.c          | 2 +-
>  include/configs/MigoR.h         | 2 --
>  include/configs/ap325rxa.h      | 2 --
>  include/configs/ap_sh4a_4a.h    | 3 ---
>  include/configs/ecovec.h        | 3 ---
>  include/configs/espt.h          | 2 --
>  include/configs/mpr2.h          | 2 --
>  include/configs/ms7720se.h      | 2 --
>  include/configs/ms7722se.h      | 2 --
>  include/configs/ms7750se.h      | 2 --
>  include/configs/r0p7734.h       | 3 ---
>  include/configs/r2dplus.h       | 2 --
>  include/configs/r7780mp.h       | 2 --
>  include/configs/rsk7203.h       | 4 +---
>  include/configs/rsk7264.h       | 4 +---
>  include/configs/rsk7269.h       | 4 +---
>  include/configs/sh7752evb.h     | 2 --
>  include/configs/sh7753evb.h     | 2 --
>  include/configs/sh7757lcr.h     | 2 --
>  include/configs/sh7763rdp.h     | 2 --
>  include/configs/sh7785lcr.h     | 2 --
>  include/configs/shmin.h         | 2 --
>  include/sh_tmu.h                | 2 +-

Applied to u-boot/master, thanks!