Hi Tom,

Please pull the rockchip updates/fixes: - Fix rk3368 lion board support; - Fix px30 odroid-go2 board support; - Add rk3399 NanoPi R4s and NanoPi M4B board support;

Gitlab ci: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/6988

Thanks, - Kever

The following changes since commit 4906238191b90be7aec2269ba8cd6aeb161cd312:

Merge tag 'dm-pull-28mar21' of git://git.denx.de/u-boot-dm into next (2021-03-28 20:29:39 -0400)

are available in the Git repository at:

https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/rockchip-for-v2021.07

for you to fetch changes up to a99d70c180dc083b47673b5f0282fc8ba8193bc9:

board: dts: rockchip: Add NanoPi M4B (2021-03-30 16:53:00 +0800)

---------------------------------------------------------------- Alexandre Vicenzi (1): board: dts: rockchip: Add NanoPi M4B

Christoph Muellner (2): rockchip: rk3399-puma: Restore correct VDD_LOG supply. rockchip: rk3399-puma: Increase environment size to 16 kiB.

Heiko Stuebner (8): rockchip: rk3368: adjust CONFIG_SYS_LOAD_ADDR rockchip: rk3368: set CONFIG_SYS_BOOTM_LEN to 64MB rockchip: rk3368: increase SYS_MALLOC_F_LEN to 0x4000 rockchip: rk3368: move STACK_R_ADDR address and into Kconfig rockchip: rk3368: sync clock dt-binding header from Linux rockchip: rk3368: sync main rk3368 dtsi from Linux rockchip: rk3368: sync down rk3368-lion board devicetree from Linux rockchip: lion: update board defconfig

Peter Robinson (2): include: configs: rk3399: drop a dangling comment rockchip: rk3399: rock960: explicitly disable SPI flash

Roger Pau Monné (3): odroid-go2: remove setting SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR odroid-go2: do not disable EFI odroid-go2: fix default FDT file path

Xiaobo Tian (1): arm64: rk3399: Add support NanoPi R4s

arch/arm/dts/Makefile | 4 +- arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 2 + ...-u-boot.dtsi => rk3368-lion-haikou-u-boot.dtsi} | 6 + arch/arm/dts/rk3368-lion-haikou.dts | 140 +++++ arch/arm/dts/{rk3368-lion.dts => rk3368-lion.dtsi} | 271 +++++++--- arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 3 + arch/arm/dts/rk3368-sheep-u-boot.dtsi | 2 + arch/arm/dts/rk3368-u-boot.dtsi | 27 + arch/arm/dts/rk3368.dtsi | 578 +++++++++++++-------- arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi | 7 + arch/arm/dts/rk3399-nanopi-m4b.dts | 52 ++ arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 16 + arch/arm/dts/rk3399-nanopi-r4s.dts | 138 +++++ arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 12 + arch/arm/mach-rockchip/rk3368/Kconfig | 5 +- board/rockchip/evb_rk3399/MAINTAINERS | 12 + board/theobroma-systems/puma_rk3399/Kconfig | 2 +- configs/lion-rk3368_defconfig | 19 +- configs/nanopi-m4b-rk3399_defconfig | 61 +++ configs/nanopi-r4s-rk3399_defconfig | 62 +++ configs/odroid-go2_defconfig | 4 +- configs/rock960-rk3399_defconfig | 1 + doc/board/rockchip/rockchip.rst | 1 + include/configs/rk3368_common.h | 4 +- include/configs/rk3399_common.h | 2 - include/dt-bindings/clock/rk3368-cru.h | 31 +- 26 files changed, 1135 insertions(+), 327 deletions(-) rename arch/arm/dts/{rk3368-lion-u-boot.dtsi => rk3368-lion-haikou-u-boot.dtsi} (96%) create mode 100644 arch/arm/dts/rk3368-lion-haikou.dts rename arch/arm/dts/{rk3368-lion.dts => rk3368-lion.dtsi} (54%) create mode 100644 arch/arm/dts/rk3368-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-m4b.dts create mode 100644 arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-nanopi-r4s.dts create mode 100644 configs/nanopi-m4b-rk3399_defconfig create mode 100644 configs/nanopi-r4s-rk3399_defconfig