mbox series

Pull request: u-boot-rockchip-20191231

Message ID 20200102083423.13532-1-kever.yang@rock-chips.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Pull request: u-boot-rockchip-20191231 | expand

Pull-request

https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20191231

Message

Kever Yang Jan. 2, 2020, 8:34 a.m. UTC
Hi Tom,

Please pull the rockchip updates/fixes:
- Fix latest mainline kernel for rk3308
- Update rk3288-evb config to suport OP-TEE
- Fix for firefly-px30 DEBUG_UART channel and make it standalone
- Script make_fit_atf add python3 support
- Fix rk3328 timer with correct COUNTER_FREQUENCY
- Fix rk3328 ATF support with enable spl-fifo-mode

Travis:
https://travis-ci.org/keveryang/u-boot/builds/631247159

Thanks,
- Kever

The following changes since commit d792b63febf492a07a106245e46532c0d43a7ecd:

  Merge branch 'master' of git://git.denx.de/u-boot-usb (2019-12-22 09:14:35 -0500)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20191231

for you to fetch changes up to c0a474b9d9a1c370f46b3f76ea0707f92d55b0b1:

  rockchip: evb-rk3328: Enable support ATF in SPL (2019-12-31 16:04:16 +0800)

----------------------------------------------------------------
Andy Yan (2):
      rockchip: rk3308: allow loading larger kernel Image
      doc: rockchip: Fix reference the wrong defconfig name of ROC-CC-RK3308

Jack Mitchell (1):
      rockchip: make_fit_atf: explicitly use python3

Jeffy Chen (3):
      rockchip: mkimage: support packing optional second level boot-loader
      doc: rockchip: document packing second level loader with mkimage
      rockchip: mkimage: fix wrong range of rc4 encoding for boot image

Kever Yang (9):
      rockchip: fit_spl_optee: get text and optee base from build
      rockchip: rk3288-evb: update SPL_STACK/MALLOC_LEN config with rk3399
      rockchip: rk3288-evb: update CONFIG_NR_DRAM_BANKS to 2
      rockchip: rk3288-evb: update config to support OPTEE
      rockchip: firefly-px30: Fix the MACRO for CONFIG_DEBUG_UART2_CHANNEL
      rockchip: px30-firefly add standalone dts
      rockchip: rk3328: add COUNTER_FREQUENCY definition
      rockchip: rk3328: enable spl-fifo-mode for emmc and sdmmc
      rockchip: evb-rk3328: Enable support ATF in SPL

Thomas Hebb (1):
      rockchip: add description for TPL_ROCKCHIP_COMMON_BOARD

 arch/arm/dts/Makefile                   |   3 +-
 arch/arm/dts/px30-firefly-u-boot.dtsi   |  84 +++++
 arch/arm/dts/px30-firefly.dts           | 531 ++++++++++++++++++++++++++++++++
 arch/arm/dts/rk3328-u-boot.dtsi         |   6 +
 arch/arm/mach-rockchip/Kconfig          |   2 +-
 arch/arm/mach-rockchip/fit_spl_optee.sh |  12 +-
 arch/arm/mach-rockchip/make_fit_atf.py  |   2 +-
 configs/evb-rk3288_defconfig            |  11 +-
 configs/evb-rk3328_defconfig            |   6 +-
 configs/firefly-px30_defconfig          |   6 +-
 doc/README.rockchip                     |  15 +-
 include/configs/rk3308_common.h         |   2 +-
 include/configs/rk3328_common.h         |   1 +
 tools/imagetool.h                       |   1 +
 tools/mkimage.c                         |   8 +
 tools/rkcommon.c                        | 242 ++++++++++++---
 tools/rkcommon.h                        |  18 +-
 tools/rkimage.c                         |   2 +-
 tools/rksd.c                            |  35 +--
 tools/rkspi.c                           |  42 +--
 20 files changed, 897 insertions(+), 132 deletions(-)
 create mode 100644 arch/arm/dts/px30-firefly-u-boot.dtsi
 create mode 100644 arch/arm/dts/px30-firefly.dts

Comments

Tom Rini Jan. 2, 2020, 11:11 p.m. UTC | #1
On Thu, Jan 02, 2020 at 04:34:23PM +0800, Kever Yang wrote:

> Hi Tom,
> 
> Please pull the rockchip updates/fixes:
> - Fix latest mainline kernel for rk3308
> - Update rk3288-evb config to suport OP-TEE
> - Fix for firefly-px30 DEBUG_UART channel and make it standalone
> - Script make_fit_atf add python3 support
> - Fix rk3328 timer with correct COUNTER_FREQUENCY
> - Fix rk3328 ATF support with enable spl-fifo-mode
> 
> Travis:
> https://travis-ci.org/keveryang/u-boot/builds/631247159
> 
> Thanks,
> - Kever
> 
> The following changes since commit d792b63febf492a07a106245e46532c0d43a7ecd:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-usb (2019-12-22 09:14:35 -0500)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20191231
> 
> for you to fetch changes up to c0a474b9d9a1c370f46b3f76ea0707f92d55b0b1:
> 
>   rockchip: evb-rk3328: Enable support ATF in SPL (2019-12-31 16:04:16 +0800)
> 

Applied to u-boot/master, thanks!