Pull request: u-boot-rockchip-20200607

Kever Yang kever.yang at rock-chips.com
Mon Jun 8 09:23:33 CEST 2020


Hi Tom,

Please pull the rockchip updates/fixes:
- revive rk3399 puma board to adapt mainline dts;
- Fix rk3399-evb stdout path;
- Enable PCIe for rk3399: Rockpro64, firefly, pinebookpro;
- Add rk3328 Rock-pi-e board;
- Enable SPI boot for rockpro64 and roc-pc-rk3399;

Gitlab ci:
https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/pipelines/3580

Thanks,
- Kever

The following changes since commit 88bd5b1793600b0f5f25c3d236b4d049fb986140:

  configs: Resync with savedefconfig (2020-06-04 19:29:09 -0400)

are available in the Git repository at:

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

for you to fetch changes up to 187ab38e766393cda7bf3bf4926c1e55f48ad0cb:

  rockchip: enable PCIe and NVMe on Pinebook Pro (2020-06-07 20:53:23 +0800)

----------------------------------------------------------------
Heiko Stuebner (8):
      arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
      arm64: dts: rk3399-puma: fix gpio levels for vcc5v0-host regulator
      rockchip: puma: fix indentation for -u-boot.dtsi
      rockchip: puma: fix indentation of misc_init_r
      rockchip: puma: reorganize devicetrees to actually work and match upstream
      rockchip: puma: remove separate fit generator
      rockchip: puma: drop special handling of usb host regulator
      rockchip: puma: enable new usb config options

Jagan Teki (4):
      Makefile: Drop to handle rkspi image type
      roc-rk3399-pc: Mark default env from SPI
      roc-rk3399-pc: Add SPI boot
      doc: rockchip: Document SPI flash program steps

Kever Yang (1):
      rockchip: rk3399-evb: add stdout-path for the board

Marcin Juszkiewicz (2):
      rockchip: rockpro64: Store default env into SPI
      rockchip: rockpro64: add SPI boot

Mark Kettenis (2):
      rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
      rockchip: Enable PCIe and NVMe on ROCKPro64

Patrick Wildt (1):
      rockchip: enable PCIe and NVMe on Pinebook Pro

b.l.huang (2):
      rockchip: rk3328: add rock-pi-e dts file
      rockchip: rk3328: add rock-pi-e-rk3328_defconfig file

 Makefile                                           |  11 +-
 arch/arm/dts/Makefile                              |   7 +-
 arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi          |  33 +++
 arch/arm/dts/rk3328-rock-pi-e.dts                  | 267 ++++++++++++++++++++
 arch/arm/dts/rk3399-evb-u-boot.dtsi                |   1 +
 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi       |   4 -
 arch/arm/dts/rk3399-puma-ddr1333.dts               |   8 -
 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi       |   4 -
 arch/arm/dts/rk3399-puma-ddr1600.dts               |   9 -
 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi       |   4 -
 arch/arm/dts/rk3399-puma-ddr1866.dts               |   8 -
 ...-u-boot.dtsi => rk3399-puma-haikou-u-boot.dtsi} |  43 ++--
 arch/arm/dts/rk3399-puma-haikou.dts                | 271 +++++++++++++++++++++
 arch/arm/dts/rk3399-puma.dtsi                      |   4 +-
 arch/arm/dts/rk3399-roc-pc-u-boot.dtsi             |  12 +-
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi          |  12 +-
 board/rockchip/evb_rk3328/MAINTAINERS              |   7 +
 board/theobroma-systems/puma_rk3399/Kconfig        |  15 ++
 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh |  94 -------
 board/theobroma-systems/puma_rk3399/puma-rk3399.c  |  93 +------
 configs/firefly-rk3399_defconfig                   |   4 +
 configs/pinebook-pro-rk3399_defconfig              |   4 +
 configs/puma-rk3399_defconfig                      |   8 +-
 configs/roc-pc-mezzanine-rk3399_defconfig          |   9 +-
 configs/roc-pc-rk3399_defconfig                    |   9 +-
 configs/rock-pi-e-rk3328_defconfig                 | 104 ++++++++
 configs/rockpro64-rk3399_defconfig                 |  10 +-
 doc/board/rockchip/rockchip.rst                    |  27 +-
 include/configs/roc-pc-rk3399.h                    |   4 -
 include/configs/rockpro64_rk3399.h                 |   2 -
 30 files changed, 830 insertions(+), 258 deletions(-)
 create mode 100644 arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3328-rock-pi-e.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts
 rename arch/arm/dts/{rk3399-puma-u-boot.dtsi => rk3399-puma-haikou-u-boot.dtsi} (53%)
 create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts
 delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
 create mode 100644 configs/rock-pi-e-rk3328_defconfig




More information about the U-Boot mailing list