projects / platform / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b59138 ad277eb)
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 patch | diff1 | diff2 | blob | history
configs/pinebook-pro-rk3399_defconfig patch | diff1 | diff2 | blob | history
configs/rockpro64-rk3399_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc configs/pinebook-pro-rk3399_defconfig
index 754cf5e,4d81b1f..e083928
--- 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
diff --cc configs/rockpro64-rk3399_defconfig
Simple merge
Domain: System / Kernel;