Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

- dts clean up to use -u-boot for px30, rk3399 boards
- dts sycn from upstream kernel for rk3328, rk3399
- add rockchip rng driver
- new board support: rk3328-roc-cc, rk3399-roc-pc,Nanopi M4 2GB

diff --combined arch/arm/dts/Makefile
index 2c123bd,23aa125..c57a646
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -106,6 -106,7 +106,7 @@@ dtb-$(CONFIG_ROCKCHIP_RK3308) += 
  
  dtb-$(CONFIG_ROCKCHIP_RK3328) += \
        rk3328-evb.dtb \
+       rk3328-roc-cc.dtb \
        rk3328-rock64.dtb
  
  dtb-$(CONFIG_ROCKCHIP_RK3368) += \
@@@ -125,12 -126,14 +126,14 @@@ dtb-$(CONFIG_ROCKCHIP_RK3399) += 
        rk3399-leez-p710.dtb \
        rk3399-nanopc-t4.dtb \
        rk3399-nanopi-m4.dtb \
+       rk3399-nanopi-m4-2gb.dtb \
        rk3399-nanopi-neo4.dtb \
        rk3399-orangepi.dtb \
        rk3399-puma-ddr1333.dtb \
        rk3399-puma-ddr1600.dtb \
        rk3399-puma-ddr1866.dtb \
        rk3399-roc-pc.dtb \
+       rk3399-roc-pc-mezzanine.dtb \
        rk3399-rock-pi-4.dtb \
        rk3399-rock960.dtb \
        rk3399-rockpro64.dtb
@@@ -377,8 -380,7 +380,8 @@@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-
        fsl-ls1088a-rdb.dtb \
        fsl-ls1088a-qds.dtb \
        fsl-ls1028a-rdb.dtb \
 -      fsl-ls1028a-qds.dtb \
 +      fsl-ls1028a-qds-duart.dtb \
 +      fsl-ls1028a-qds-lpuart.dtb \
        fsl-lx2160a-rdb.dtb \
        fsl-lx2160a-qds.dtb
  dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
@@@ -749,11 -751,11 +752,11 @@@ dtb-$(CONFIG_RCAR_GEN2) += 
        r8a7794-silk-u-boot.dtb
  
  dtb-$(CONFIG_RCAR_GEN3) += \
 -      r8a7795-h3ulcb-u-boot.dtb \
 -      r8a7795-salvator-x-u-boot.dtb \
 -      r8a7796-m3ulcb-u-boot.dtb \
 -      r8a7796-salvator-x-u-boot.dtb \
 -      r8a77965-m3nulcb-u-boot.dtb \
 +      r8a77950-ulcb-u-boot.dtb \
 +      r8a77950-salvator-x-u-boot.dtb \
 +      r8a77960-ulcb-u-boot.dtb \
 +      r8a77960-salvator-x-u-boot.dtb \
 +      r8a77965-ulcb-u-boot.dtb \
        r8a77965-salvator-x-u-boot.dtb \
        r8a77970-eagle-u-boot.dtb \
        r8a77980-condor-u-boot.dtb \

diff --combined configs/evb-px30_defconfig
index f8d6674,d2cf13e..b2fda44
--- 1/configs/evb-px30_defconfig
--- 2/configs/evb-px30_defconfig
+++ b/configs/evb-px30_defconfig
@@@ -12,8 -12,8 +12,8 @@@ CONFIG_SPL_STACK_R_ADDR=0x60000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_DEBUG_UART_BASE=0xFF160000
  CONFIG_DEBUG_UART_CLOCK=24000000
 -CONFIG_DEBUG_UART=y
  CONFIG_SPL_TEXT_BASE=0x00000000
 +CONFIG_DEBUG_UART=y
  CONFIG_TPL_SYS_MALLOC_F_LEN=0x600
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_FIT=y
@@@ -85,6 -85,8 +85,8 @@@ CONFIG_SPL_RAM=
  CONFIG_TPL_RAM=y
  CONFIG_ROCKCHIP_SDRAM_COMMON=y
  CONFIG_DM_RESET=y
+ CONFIG_DM_RNG=y
+ CONFIG_RNG_ROCKCHIP=y
  # CONFIG_SPECIFY_CONSOLE_INDEX is not set
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_DEBUG_UART_SKIP_INIT=y
@@@ -101,6 -103,7 +103,6 @@@ CONFIG_DISPLAY=
  CONFIG_LCD=y
  CONFIG_SPL_TINY_MEMSET=y
  CONFIG_TPL_TINY_MEMSET=y
 -CONFIG_LZ4=y
  CONFIG_LZO=y
  CONFIG_ERRNO_STR=y
  # CONFIG_EFI_LOADER is not set