Update Rock960 patch

rockchip-Rock960-Fix-up-USB-support.patch

@@ -1,29 +1,33 @@
-From 74ac6aad46c7d05e925b767fdb9a1306af6d5168 Mon Sep 17 00:00:00 2001
+From aec6cfccd62e21bdb8686839a22eaff5f8cece1d Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Wed, 19 Aug 2020 16:55:11 +0100
-Subject: [PATCH] rockchip: Rock960: Fix up USB support
+Date: Tue, 29 Sep 2020 13:12:15 +0100
+Subject: [PATCH] rockchip: Rock960: fix up USB support
 
 Fix up USB config options so keyboards and other USB devices work.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
- configs/rock960-rk3399_defconfig | 9 ++++++++-
+ configs/rock960-rk3399_defconfig | 9 ++++++---
  include/configs/rock960_rk3399.h | 2 ++
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
-index 9c4d8871b7..d6d787aa02 100644
+index 1d997847c2..a5a50785c5 100644
 --- a/configs/rock960-rk3399_defconfig
 +++ b/configs/rock960-rk3399_defconfig
-@@ -33,6 +33,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_SYS_MMC_ENV_DEV=1
- CONFIG_ROCKCHIP_GPIO=y
- CONFIG_SYS_I2C_ROCKCHIP=y
-+CONFIG_DM_KEYBOARD=y
- CONFIG_MMC_DW=y
- CONFIG_MMC_DW_ROCKCHIP=y
- CONFIG_MMC_SDHCI=y
-@@ -43,6 +44,8 @@ CONFIG_RNG_ROCKCHIP=y
+@@ -3,12 +3,12 @@ CONFIG_ARCH_ROCKCHIP=y
+ CONFIG_SYS_TEXT_BASE=0x00200000
+ CONFIG_ENV_OFFSET=0x3F8000
+ CONFIG_ROCKCHIP_RK3399=y
+-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
+ CONFIG_TARGET_ROCK960_RK3399=y
+ CONFIG_DEBUG_UART_BASE=0xFF1A0000
+ 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
+@@ -41,6 +41,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
  CONFIG_DM_ETH=y
  CONFIG_NVME=y
  CONFIG_PCI=y
@@ -32,7 +36,7 @@ index 9c4d8871b7..d6d787aa02 100644
  CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
-@@ -56,8 +59,10 @@ CONFIG_USB_XHCI_HCD=y
+@@ -54,10 +56,11 @@ CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
@@ -40,19 +44,12 @@ index 9c4d8871b7..d6d787aa02 100644
 +CONFIG_USB_OHCI_GENERIC=y
  CONFIG_USB_DWC3=y
 -CONFIG_ROCKCHIP_USB2_PHY=y
-+CONFIG_USB_DWC3_GENERIC=y
++CONFIG_DM_KEYBOARD=y
  CONFIG_USB_KEYBOARD=y
- CONFIG_USB_GADGET=y
+-CONFIG_USB_GADGET=y
  CONFIG_USB_HOST_ETHER=y
-@@ -68,6 +73,8 @@ CONFIG_USB_ETHER_RTL8152=y
- CONFIG_USB_ETHER_SMSC95XX=y
- CONFIG_DM_VIDEO=y
- CONFIG_DISPLAY=y
-+CONFIG_VIDEO_BPP16=y
-+CONFIG_VIDEO_BPP32=y
- CONFIG_VIDEO_ROCKCHIP=y
- CONFIG_DISPLAY_ROCKCHIP_HDMI=y
- CONFIG_SPL_TINY_MEMSET=y
+ CONFIG_USB_ETHER_ASIX=y
+ CONFIG_USB_ETHER_ASIX88179=y
 diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
 index c6f9122154..2edad71028 100644
 --- a/include/configs/rock960_rk3399.h

uboot-tools.spec

@@ -30,14 +30,14 @@ Patch7:   arm-add-BOOTENV_EFI_SET_FDTFILE_FALLBACK-for-tegra186-be.patch
 Patch8:   AllWinner-UpstreamSync.patch
 Patch9:   AllWinner-PinePhone.patch
 Patch10:  AllWinner-PineTab.patch
-# Rockchips improvements
-Patch11:  arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
-Patch12:  rockchip-Rock960-Fix-up-USB-support.patch
-Patch13:  rk3399-Pinebook-pro-EDP-support.patch
-Patch14:  rk3399-reset-display-hack.patch
 # TI fixes
-Patch15:  0001-Fix-BeagleAI-detection.patch
-Patch16: 0001-Define-default-CONFIG_PREBOOT-with-right-config-opti.patch
+Patch12:  0001-Fix-BeagleAI-detection.patch
+# Rockchips improvements
+Patch13:  arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch
+Patch14:  rk3399-Pinebook-pro-EDP-support.patch
+Patch15:  rk3399-reset-display-hack.patch
+Patch16:  0001-Define-default-CONFIG_PREBOOT-with-right-config-opti.patch
+Patch17:  rockchip-Rock960-Fix-up-USB-support.patch
 
 BuildRequires:  bc
 BuildRequires:  dtc