mbox

[U-Boot] Please pull u-boot-rockchip

Message ID CAPnjgZ1octfLJwdY_U=JY+dAQoHxC2cFHT3s1MPAF1yQwqZjvw@mail.gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-rockchip.git

Message

Simon Glass Feb. 10, 2017, 4:20 a.m. UTC 
Hi Tom,

This includes a board rename and a few other minor changes.


The following changes since commit 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a:

  Merge git://git.denx.de/u-boot-dm (2017-02-08 16:24:44 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-rockchip.git

for you to fetch changes up to 6f2797645562e85c407aab3e9a757bfd61a027fe:

  rockchip: rename miniarm to tinker board (2017-02-09 12:10:59 -0700)

----------------------------------------------------------------
Eddie Cai (1):
      rockchip: rename miniarm to tinker board

Jacob Chen (3):
      rockchip: dts: rk3288: correct sdram setting for miniarm
      rockchip: configs: move env offset to common header
      rockchip: firefly: configs: use spl back to brom

Romain Perier (1):
      rockchip: Enable ETH address randomization for the firefly-rk3288

Simon Glass (1):
      rockchip: Correct MAINTAINER entry for chromebook_minnie

 arch/arm/dts/Makefile                              |  2 +-
 arch/arm/dts/rk3288-miniarm.dts                    | 58
----------------------
 arch/arm/dts/rk3288-tinker.dts                     | 58
++++++++++++++++++++++
 .../{rk3288-miniarm.dtsi => rk3288-tinker.dtsi}    |  0
 arch/arm/mach-rockchip/rk3288-board.c              |  2 +-
 arch/arm/mach-rockchip/rk3288/Kconfig              | 10 ++--
 board/google/veyron/MAINTAINERS                    |  4 +-
 board/rockchip/miniarm_rk3288/MAINTAINERS          |  6 ---
 .../{miniarm_rk3288 => tinker_rk3288}/Kconfig      |  6 +--
 board/rockchip/tinker_rk3288/MAINTAINERS           |  6 +++
 .../{miniarm_rk3288 => tinker_rk3288}/Makefile     |  2 +-
 .../tinker-rk3288.c}                               |  0
 configs/firefly-rk3288_defconfig                   |  3 +-
 ...rm-rk3288_defconfig => tinker-rk3288_defconfig} |  4 +-
 doc/README.rockchip                                |  2 +-
 include/configs/evb_rk3288.h                       | 14 ------
 include/configs/fennec_rk3288.h                    | 14 ------
 include/configs/firefly-rk3288.h                   |  5 --
 include/configs/kylin_rk3036.h                     | 14 ------
 include/configs/popmetal_rk3288.h                  | 14 ------
 include/configs/rock2.h                            | 14 ------
 include/configs/rockchip-common.h                  | 14 ++++++
 .../configs/{miniarm_rk3288.h => tinker_rk3288.h}  | 14 ------
 23 files changed, 96 insertions(+), 170 deletions(-)
 delete mode 100644 arch/arm/dts/rk3288-miniarm.dts
 create mode 100644 arch/arm/dts/rk3288-tinker.dts
 rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%)
 delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%)
 create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS
 rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%)
 rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c =>
tinker_rk3288/tinker-rk3288.c} (100%)
 rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%)
 rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (59%)


Regards,
Simon

Comments

Tom Rini Feb. 11, 2017, 9:33 p.m. UTC | #1 
On Thu, Feb 09, 2017 at 09:20:56PM -0700, Simon Glass wrote:

> Hi Tom,
> 
> This includes a board rename and a few other minor changes.
> 
> 
> The following changes since commit 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a:
> 
>   Merge git://git.denx.de/u-boot-dm (2017-02-08 16:24:44 -0500)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-rockchip.git
> 
> for you to fetch changes up to 6f2797645562e85c407aab3e9a757bfd61a027fe:
> 
>   rockchip: rename miniarm to tinker board (2017-02-09 12:10:59 -0700)
> 

Applied to u-boot/master, thanks!