mbox

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

Message ID CAPnjgZ1tkLVGdKM3U3KeHB6b2G11u-wTT24OebOicmNn30b+hg@mail.gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Simon Glass Oct. 31, 2016, 5:40 p.m. UTC
Hi Tom,

This includes various minor tweaks for rockchip.


The following changes since commit 48d2fc47c9feac54fdc0e2e0462f13b1a8689ece:

  Merge branch 'sun9i-a80-spl' of http://git.denx.de/u-boot-sunxi
(2016-10-30 08:12:00 -0400)

are available in the git repository at:

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

for you to fetch changes up to 4594ac07847f5c7fe7294ce6c71849fea0a431e0:

  rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT
(2016-10-30 13:29:06 -0600)

----------------------------------------------------------------
Jacob Chen (3):
      clk: rk3399: fix rockchip_get_cru
      rockchip: use rockchip linux partitions layout
      rockchip: doc: add GPT partition layout

Kever Yang (7):
      rk3399: disable the clock multiplier support when SoC init
      rk3288: fix reg address for GRF_SOC_CON2
      evb-rk3399: config: set emmc as default boot dev
      rk3288: config change for enable dram capacity auto-detect.
      rk3288: sdram: auto-detect the capacity
      dts: rk3288: remove node in dmc which not need anymore
      rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT

Sandy Patterson (1):
      rockchip: RK3288 needs fdt and initrd below 256M now

Simon Glass (3):
      rockchip: rk3036: Move rockchip_get_cru() out of the driver
      rockchip: rk3399: Move rockchip_get_cru() out of the driver
      rockchip: rk3288: Move rockchip_get_cru() out of the driver

 arch/arm/dts/rk3288-evb.dts                     |   3 -
 arch/arm/dts/rk3288-fennec.dts                  |   3 -
 arch/arm/dts/rk3288-firefly.dts                 |   2 -
 arch/arm/dts/rk3288-miniarm.dts                 |   3 -
 arch/arm/dts/rk3288-popmetal.dts                |   3 -
 arch/arm/dts/rk3288-rock2-square.dts            |   2 -
 arch/arm/dts/rk3288-veyron.dtsi                 |   2 -
 arch/arm/include/asm/arch-rockchip/cru_rk3036.h |   6 ++
 arch/arm/include/asm/arch-rockchip/cru_rk3288.h |   7 +++
 arch/arm/include/asm/arch-rockchip/cru_rk3399.h |   6 ++
 arch/arm/include/asm/arch-rockchip/sdram.h      |  15 +++++
 arch/arm/mach-rockchip/rk3036/Makefile          |   2 +
 arch/arm/mach-rockchip/rk3036/clk_rk3036.c      |  33 +++++++++++
 arch/arm/mach-rockchip/rk3288/Kconfig           |   3 -
 arch/arm/mach-rockchip/rk3288/clk_rk3288.c      |  16 ++++++
 arch/arm/mach-rockchip/rk3288/rk3288.c          |   2 +-
 arch/arm/mach-rockchip/rk3288/sdram_rk3288.c    | 272
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 arch/arm/mach-rockchip/rk3399/Makefile          |   1 +
 arch/arm/mach-rockchip/rk3399/clk_rk3399.c      |  33 +++++++++++
 arch/arm/mach-rockchip/rk3399/rk3399.c          |  14 +++++
 configs/evb-rk3288_defconfig                    |   1 +
 configs/fennec-rk3288_defconfig                 |   1 +
 configs/miniarm-rk3288_defconfig                |   1 +
 configs/popmetal-rk3288_defconfig               |   1 +
 doc/README.rockchip                             |  11 +++-
 drivers/clk/rockchip/clk_rk3036.c               |  24 +-------
 drivers/clk/rockchip/clk_rk3288.c               |  21 -------
 drivers/clk/rockchip/clk_rk3399.c               |  24 +-------
 include/configs/evb_rk3399.h                    |   2 +-
 include/configs/rk3036_common.h                 |  17 +-----
 include/configs/rk3288_common.h                 |  23 ++------
 include/configs/rk3399_common.h                 |  16 +-----
 include/configs/rockchip-common.h               |  35 ++++++++++++
 33 files changed, 422 insertions(+), 183 deletions(-)
 create mode 100644 arch/arm/mach-rockchip/rk3036/clk_rk3036.c
 create mode 100644 arch/arm/mach-rockchip/rk3399/clk_rk3399.c
 create mode 100644 include/configs/rockchip-common.h

Regards,
Simon

Comments

Tom Rini Nov. 4, 2016, 11:22 a.m. UTC | #1
On Mon, Oct 31, 2016 at 11:40:10AM -0600, Simon Glass wrote:

> Hi Tom,
> 
> This includes various minor tweaks for rockchip.
> 
> 
> The following changes since commit 48d2fc47c9feac54fdc0e2e0462f13b1a8689ece:
> 
>   Merge branch 'sun9i-a80-spl' of http://git.denx.de/u-boot-sunxi
> (2016-10-30 08:12:00 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-rockchip.git
> 
> for you to fetch changes up to 4594ac07847f5c7fe7294ce6c71849fea0a431e0:
> 
>   rk3288: kconfig: remove duplicate definition of SPL_MMC_SUPPORT
> (2016-10-30 13:29:06 -0600)
> 

Applied to u-boot/master (before v2016.11-rc3), thanks!