Pull request: u-boot-rockchip-20200220
mbox series

Message ID 20200221011741.23645-1-kever.yang@rock-chips.com
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • Pull request: u-boot-rockchip-20200220
Related show

Pull-request

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

Message

Kever Yang Feb. 21, 2020, 1:17 a.m. UTC
Hi Tom,

Please pull the rockchip updates/fixes:
- rk3399: split roc-pc-rk3399 out of evb_rk3399
- sync dts from upstream kernel for rk3399,rk3288,px30
- boot_mode: find the saradc device name

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

Thanks,
- Kever

The following changes since commit f2a73d6867ef973fbb8471cc87058205999b5e5c:

  Merge tag 'u-boot-stm32-20200214' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2020-02-14 07:31:47 -0500)

are available in the Git repository at:

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

for you to fetch changes up to f9561d8e3671415c7780df4b5e70f0f1e2d2bf57:

  arch: arm: rockchip: order the rk3399 entries alphabetically (2020-02-20 09:18:14 +0800)

----------------------------------------------------------------
Heiko Stuebner (3):
      rockchip: make_fit_atf: use correct fdt_x references in config nodes
      rockchip: make the global board_fit_config_name_match __weak
      rockchip: px30: sync the main px30 dtsi from mainline

Hugh Cole-Baker (1):
      rockchip: boot_mode: find the saradc device name

Jagan Teki (4):
      rockchip: rk3288: Enable pre console buffer
      ARM: dts: rockchip: Sync rk3288-vyasa dts from linux
      rk3288: tinker: Enable HDMI output
      rk3288: vyasa: Add console settings

Jared Baldridge (1):
      configs: fix typos in khadas-edge defconfigs

Kever Yang (1):
      rockchip: rk3399: add target type for evb based board

Peter Robinson (4):
      arm: dts: rockchip: Update EVB/Puma devices to upstream USB/dwc3 conventions
      arm: dts: rockchip: rk3399: Move U-Boot specific bits to rk3399-u-boot
      arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi
      arch: arm: rockchip: order the rk3399 entries alphabetically

Suniel Mahesh (2):
      rockchip: rk3399: split roc-pc-rk3399 out of evb_rk3399
      board: roc-pc-rk3399: Add support for onboard LED's and push button to indicate power mode

 arch/arm/dts/px30.dtsi                       | 182 +++++++++++++++++++++++++--
 arch/arm/dts/rk3288-vyasa.dts                |  79 +++++-------
 arch/arm/dts/rk3399-evb.dts                  |   4 +-
 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi |   4 +
 arch/arm/dts/rk3399-puma-ddr1333.dts         |   2 -
 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi |   4 +
 arch/arm/dts/rk3399-puma-ddr1600.dts         |   2 -
 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi |   4 +
 arch/arm/dts/rk3399-puma-ddr1866.dts         |   2 -
 arch/arm/dts/rk3399-puma-u-boot.dtsi         |  24 ++++
 arch/arm/dts/rk3399-puma.dtsi                |  23 +---
 arch/arm/dts/rk3399-u-boot.dtsi              |  55 ++++++--
 arch/arm/dts/rk3399.dtsi                     |  38 ------
 arch/arm/mach-rockchip/Kconfig               |   1 +
 arch/arm/mach-rockchip/boot_mode.c           |  22 +++-
 arch/arm/mach-rockchip/make_fit_atf.py       |   2 +-
 arch/arm/mach-rockchip/rk3399/Kconfig        |  42 +++++--
 arch/arm/mach-rockchip/spl.c                 |   2 +-
 arch/arm/mach-rockchip/tpl.c                 |   7 ++
 board/firefly/roc-pc-rk3399/Kconfig          |  16 +++
 board/firefly/roc-pc-rk3399/MAINTAINERS      |   6 +
 board/firefly/roc-pc-rk3399/Makefile         |   7 ++
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c  |  61 +++++++++
 board/rockchip/evb_rk3399/MAINTAINERS        |   6 -
 common/Kconfig                               |   1 +
 configs/evb-rk3399_defconfig                 |   1 +
 configs/firefly-rk3399_defconfig             |   1 +
 configs/khadas-edge-captain-rk3399_defconfig |   3 +-
 configs/khadas-edge-rk3399_defconfig         |   1 +
 configs/khadas-edge-v-rk3399_defconfig       |   3 +-
 configs/leez-rk3399_defconfig                |   1 +
 configs/nanopc-t4-rk3399_defconfig           |   1 +
 configs/nanopi-m4-rk3399_defconfig           |   1 +
 configs/nanopi-neo4-rk3399_defconfig         |   1 +
 configs/orangepi-rk3399_defconfig            |   1 +
 configs/roc-pc-rk3399_defconfig              |   2 +
 configs/rock-pi-4-rk3399_defconfig           |   1 +
 configs/tinker-rk3288_defconfig              |   6 +
 include/configs/roc-pc-rk3399.h              |  22 ++++
 include/configs/tinker_rk3288.h              |   6 +-
 include/configs/vyasa-rk3288.h               |   6 +-
 41 files changed, 494 insertions(+), 159 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-puma-u-boot.dtsi
 create mode 100644 board/firefly/roc-pc-rk3399/Kconfig
 create mode 100644 board/firefly/roc-pc-rk3399/MAINTAINERS
 create mode 100644 board/firefly/roc-pc-rk3399/Makefile
 create mode 100644 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c
 create mode 100644 include/configs/roc-pc-rk3399.h

Comments

Tom Rini Feb. 21, 2020, 7:29 p.m. UTC | #1
On Fri, Feb 21, 2020 at 09:17:41AM +0800, Kever Yang wrote:

> Hi Tom,
> 
> Please pull the rockchip updates/fixes:
> - rk3399: split roc-pc-rk3399 out of evb_rk3399
> - sync dts from upstream kernel for rk3399,rk3288,px30
> - boot_mode: find the saradc device name
> 
> Travis:
> https://travis-ci.org/keveryang/u-boot/builds/652785865
> 
> Thanks,
> - Kever
> 
> The following changes since commit f2a73d6867ef973fbb8471cc87058205999b5e5c:
> 
>   Merge tag 'u-boot-stm32-20200214' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2020-02-14 07:31:47 -0500)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200220
> 
> for you to fetch changes up to f9561d8e3671415c7780df4b5e70f0f1e2d2bf57:
> 
>   arch: arm: rockchip: order the rk3399 entries alphabetically (2020-02-20 09:18:14 +0800)
> 

Applied to u-boot/master, thanks!