]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'u-boot-rockchip-20201031' of https://gitlab.denx.de/u-boot/custodians...
authorTom Rini <trini@konsulko.com>
Sat, 31 Oct 2020 02:55:16 +0000 (22:55 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 31 Oct 2020 03:13:13 +0000 (23:13 -0400)
- 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;

1  2 
arch/arm/dts/Makefile
configs/rock-pi-n8-rk3288_defconfig
configs/rock960-rk3399_defconfig
drivers/clk/rockchip/clk_rk3399.c

Simple merge
index e5bc03592620808af9520d6552894bef35375f05,7615f61031d2d835ea4b501a50932953aabb0afa..d1d1613f58155e9680814936a4f03f41867bcc67
@@@ -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
index c3ce27e019ffa74ed93aba206e37c06a4ba547cb,a5a50785c5bab4b558fc5d12d21a363589275a21..5d893de4a5c51a6bb8962c298d7f726a737397db
@@@ -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
Simple merge