From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 16 May 2014 22:35:36 +0200
Subject: [U-Boot] Pull request: u-boot-sh/rmobile into u-boot-arm/master
In-Reply-To: <CABMQnVJTu0x5ab3g7B4r5t7bm8NATMB2aVsmYG6QRg_1FE67UQ@mail.gmail.com>
References: <CABMQnVJTu0x5ab3g7B4r5t7bm8NATMB2aVsmYG6QRg_1FE67UQ@mail.gmail.com>
Message-ID: <E1WlOqv-0002VS-QG@janus>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Nobuhiro,

On Fri, 2 May 2014 05:14:44 +0900, Nobuhiro Iwamatsu
<iwamatsu@nigauri.org> wrote:

> Dear Albert Aribaud,
> 
> Please pull u-boot-sh/rmobile into u-boot-arm/master.
> 
> The following changes since commit c9aab0f9dd23fddcebf5984dc19e62b514e759a7:
> 
>   Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2014-04-21
> 21:01:35 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-sh.git rmobile
> 
> for you to fetch changes up to 8d18bcfd439b8422ab3bada2001cc2abd525d9f8:
> 
>   arm: rmobile: lager: Remove MACH_TYPE_LAGER and CONFIG_MACH_TYPE
> (2014-04-28 04:35:12 +0900)
> 
> ----------------------------------------------------------------
> Nobuhiro Iwamatsu (22):
>       arm: rmobile: Coordinate the common part of the header file of
> r8a7790 and r8a7791
>       arm: rmobile: r8a779x: Fix L2 cache init and latency setting
>       arm: rmobile: koelsch: Change name of structure
>       arm: rmobile: koelsch: Remove NOR-Flash support
>       arm: rmobile: lager: Change name of the structure
>       arm: rmobile: lager: Remove NOR-Flash support
>       arm: rmobile: Merge functions to get the CPU information of
> R8A7790 and R8A7791
>       arm: rmobile: Add 1 to value of the CPU revision in
> rmobile_get_cpu_rev_integer()
>       arm: rmobile: Add rmobile_get_cpu_rev_fraction() for R-Car SoCs
>       arm: rmobile: Add prototype for function to get the CPU
> information to rmobile.h
>       arm: rmobile: Update print_cpuinfo function
>       arm: rmobile: r8a7790: Add support ES2 revision
>       arm: rmobile: r8a7791: Add support ES2 revision
>       arm: rmobile: keolsch: Add support ES2 revision of R8A7791
>       arm: rmobile: lager: Update QoS initialization to version 0.955
>       arm: rmobile: koelsch: Update QoS initialization
>       arm: rmobile: koelsch: Update calculation of CONFIG_SH_TMU_CLK_FREQ
>       arm: rmobile: Add register infomation of PLL regsiter
>       arm: rmobile: koelsch: Change to maximum CPU frequency
>       arm: rmobile: lager: Update calculation of CONFIG_SH_TMU_CLK_FREQ
>       arm: rmobile: lager: Change to maximum CPU frequency
>       arm: rmobile: lager: Remove MACH_TYPE_LAGER and CONFIG_MACH_TYPE
> 
>  arch/arm/cpu/armv7/rmobile/Makefile                |   4 +-
>  arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c      |  29 -
>  .../{cpu_info-r8a7790.c => cpu_info-rcar.c}        |  12 +-
>  arch/arm/cpu/armv7/rmobile/cpu_info.c              |  49 +-
>  arch/arm/cpu/armv7/rmobile/lowlevel_init_ca15.S    |  20 +-
>  arch/arm/include/asm/arch-rmobile/r8a7790.h        | 609 +-------------------
>  arch/arm/include/asm/arch-rmobile/r8a7791.h        | 626 +-------------------
>  arch/arm/include/asm/arch-rmobile/rcar-base.h      | 637 +++++++++++++++++++++
>  arch/arm/include/asm/arch-rmobile/rmobile.h        |   6 +
>  board/renesas/koelsch/koelsch.c                    | 194 +------
>  board/renesas/koelsch/qos.c                        | 404 +++++++------
>  board/renesas/lager/lager.c                        | 196 +------
>  board/renesas/lager/qos.c                          | 236 ++++----
>  boards.cfg                                         |   2 -
>  include/configs/koelsch.h                          |  36 +-
>  include/configs/lager.h                            |  40 +-
>  16 files changed, 1092 insertions(+), 2008 deletions(-)
>  delete mode 100644 arch/arm/cpu/armv7/rmobile/cpu_info-r8a7791.c
>  rename arch/arm/cpu/armv7/rmobile/{cpu_info-r8a7790.c => cpu_info-rcar.c} (50%)
>  create mode 100644 arch/arm/include/asm/arch-rmobile/rcar-base.h
> 

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.