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

- dts sync from kernel for rk3399 boards;
- Add Radxa Rock Pi N8, N10;
- Some feature update for Pinebook Pro;

diff --combined arch/arm/dts/Makefile
index 89fa44881800a71429314cd81b0900dcf65bc63d,aae95811c1d8fc92b812df4d2bf72ff67a028ac3..d345e30f351ef7473148f398658b97196cd5ee3e
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -92,6 -92,7 +92,7 @@@ dtb-$(CONFIG_ROCKCHIP_RK3288) += 
        rk3288-phycore-rdk.dtb \
        rk3288-popmetal.dtb \
        rk3288-rock2-square.dtb \
+       rk3288-rock-pi-n8.dtb \
        rk3288-tinker.dtb \
        rk3288-tinker-s.dtb \
        rk3288-veyron-jerry.dtb \
@@@ -136,7 -137,8 +137,8 @@@ dtb-$(CONFIG_ROCKCHIP_RK3399) += 
        rk3399-roc-pc-mezzanine.dtb \
        rk3399-rock-pi-4.dtb \
        rk3399-rock960.dtb \
-       rk3399-rockpro64.dtb
+       rk3399-rockpro64.dtb \
+       rk3399pro-rock-pi-n10.dtb
  
  dtb-$(CONFIG_ROCKCHIP_RV1108) += \
        rv1108-elgin-r1.dtb \
@@@ -280,7 -282,6 +282,7 @@@ dtb-$(CONFIG_ARCH_ZYNQMP) += 
        zynqmp-mini-emmc1.dtb                   \
        zynqmp-mini-nand.dtb                    \
        zynqmp-mini-qspi.dtb                    \
 +      zynqmp-topic-miamimp-xilinx-xdp-v1r1.dtb        \
        zynqmp-zcu100-revC.dtb                  \
        zynqmp-zcu102-revA.dtb                  \
        zynqmp-zcu102-revB.dtb                  \
@@@ -849,17 -850,6 +851,17 @@@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += 
  dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
        omap3-igep0020.dtb
  
 +dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
 +      omap4-panda.dtb \
 +      omap4-panda-es.dtb
 +
 +dtb-$(CONFIG_TARGET_OMAP4_SDP4430) += \
 +      omap4-sdp.dtb \
 +      omap4-sdp-es23plus.dtb
 +
 +dtb-$(CONFIG_TARGET_OMAP5_UEVM) += \
 +      omap5-uevm.dtb
 +
  dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
        at91-sama5d2_ptc_ek.dtb
  

diff --combined configs/pinebook-pro-rk3399_defconfig
index 754cf5e5b4013fb1f09a8ea1bb6df3d219ccc3b3,4d81b1ff09b0008e990561da93389dbd6566278f..e0839286f999d88052d756e3ff31a0aa9b27f9ee
--- 1/configs/pinebook-pro-rk3399_defconfig
--- 2/configs/pinebook-pro-rk3399_defconfig
+++ b/configs/pinebook-pro-rk3399_defconfig
@@@ -1,7 -1,7 +1,8 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
 +CONFIG_SPL_DM_SPI=y
+ CONFIG_ENV_SIZE=0x8000
  CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -10,7 -10,10 +11,10 @@@ CONFIG_DEBUG_UART_CLOCK=2400000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_DEBUG_UART=y
+ CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
  CONFIG_BOOTDELAY=3
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="usb start"
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
  CONFIG_MISC_INIT_R=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y
@@@ -18,6 -21,7 +22,7 @@@
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
  CONFIG_SPL_MTD_SUPPORT=y
+ CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPIO=y
@@@ -31,11 -35,12 +36,12 @@@ CONFIG_CMD_TIME=
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
  CONFIG_SPL_OF_CONTROL=y
- CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
+ CONFIG_DM_KEYBOARD=y
  CONFIG_LED=y
  CONFIG_LED_GPIO=y
  CONFIG_MISC=y
@@@ -58,6 -63,8 +64,8 @@@ CONFIG_REGULATOR_RK8XX=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM_RK3399_LPDDR4=y
  CONFIG_DM_RESET=y
+ CONFIG_DM_RNG=y
+ CONFIG_RNG_ROCKCHIP=y
  CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_ROCKCHIP_SPI=y
@@@ -67,6 -74,8 +75,8 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
+ CONFIG_USB_OHCI_HCD=y
+ CONFIG_USB_OHCI_GENERIC=y
  CONFIG_USB_DWC3=y
  CONFIG_ROCKCHIP_USB2_PHY=y
  CONFIG_USB_KEYBOARD=y

diff --combined configs/rockpro64-rk3399_defconfig
index 3575cf7e5b97d545a59c488f714c5b0b640063e6,56e8b3e01168eb22d23e4bdaa7806a7ed95627fc..31b3ee2aa40e1820e0bf88ec2bdc2b8a5259a0a3
--- 1/configs/rockpro64-rk3399_defconfig
--- 2/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@@ -3,7 -3,6 +3,7 @@@ CONFIG_ARCH_ROCKCHIP=
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ENV_SIZE=0x8000
  CONFIG_ENV_OFFSET=0x3F8000
 +CONFIG_SPL_DM_SPI=y
  CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_ROCKPRO64_RK3399=y
  CONFIG_NR_DRAM_BANKS=1
@@@ -12,6 -11,8 +12,8 @@@ CONFIG_DEBUG_UART_CLOCK=2400000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_DEBUG_UART=y
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT="usb start"
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
  CONFIG_MISC_INIT_R=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y