From: Tom Rini <trini@konsulko.com>
Date: Wed, 8 Jul 2020 03:05:57 +0000 (-0400)
Subject: Merge tag 'u-boot-rockchip-20200708' of https://gitlab.denx.de/u-boot/custodians... 
X-Git-Tag: baikal/mips/sdk5.9~315
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=4a29519d35a891b8ba457216843b44c5ffef66e2;p=uboot.git

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

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

4a29519d35a891b8ba457216843b44c5ffef66e2
diff --cc configs/pinebook-pro-rk3399_defconfig
index 754cf5e5b4,4d81b1ff09..e0839286f9
--- a/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