From: Tom Rini <trini@konsulko.com>
Date: Sat, 31 Oct 2020 02:55:16 +0000 (-0400)
Subject: Merge tag 'u-boot-rockchip-20201031' of https://gitlab.denx.de/u-boot/custodians... 
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=2c31d7e746766f47a007f39c030706e493a9cc77;p=u-boot.git

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

- New PX30 board: Engicam PX30.Core;
- Fix USB HID support for rock960;
- Remove host endianness dependency for rockchip mkimage;
- dts update for rk3288-tinker;
- Enable console MUX for some ROCKPi boards;
- Add config-based ddr selection for px30;
---

2c31d7e746766f47a007f39c030706e493a9cc77
diff --cc configs/rock-pi-n8-rk3288_defconfig
index e5bc035926,7615f61031..d1d1613f58
--- a/configs/rock-pi-n8-rk3288_defconfig
+++ b/configs/rock-pi-n8-rk3288_defconfig
@@@ -14,9 -14,8 +14,7 @@@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock
  CONFIG_DEBUG_UART=y
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
- CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
  CONFIG_SILENT_CONSOLE=y
- # CONFIG_CONSOLE_MUX is not set
 -CONFIG_DEFAULT_FDT_FILE="rk3288-rock-pi-n8.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
diff --cc configs/rock960-rk3399_defconfig
index c3ce27e019,a5a50785c5..5d893de4a5
--- a/configs/rock960-rk3399_defconfig
+++ b/configs/rock960-rk3399_defconfig
@@@ -9,9 -8,10 +8,10 @@@ CONFIG_DEBUG_UART_BASE=0xFF1A000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960"
  CONFIG_DEBUG_UART=y
+ CONFIG_USE_PREBOOT=y
  CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
 -CONFIG_MISC_INIT_R=y
  CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_MISC_INIT_R=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000