]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Merge tag 'u-boot-rockchip-20200708' of https://gitlab.denx.de/u-boot/custodians...
authorTom Rini <trini@konsulko.com>
Wed, 8 Jul 2020 03:05:57 +0000 (23:05 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 8 Jul 2020 03:05:57 +0000 (23:05 -0400)
- dts sync from kernel for rk3399 boards;
- Add Radxa Rock Pi N8, N10;
- Some feature update for Pinebook Pro;

1  2 
arch/arm/dts/Makefile
configs/pinebook-pro-rk3399_defconfig
configs/rockpro64-rk3399_defconfig

Simple merge
index 754cf5e5b4013fb1f09a8ea1bb6df3d219ccc3b3,4d81b1ff09b0008e990561da93389dbd6566278f..e0839286f999d88052d756e3ff31a0aa9b27f9ee
@@@ -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
Simple merge