From: Tom Rini <trini@konsulko.com>
Date: Mon, 27 Feb 2023 22:28:21 +0000 (-0500)
Subject: Merge tag 'v2023.04-rc3' into next
X-Git-Tag: baikal/mips/sdk6.2~4^2~3^2~175^2~44
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=84742ecf18a5a5118ce4f2f816114093452f5309;p=uboot.git

Merge tag 'v2023.04-rc3' into next

Prepare v2023.04-rc3
---

84742ecf18a5a5118ce4f2f816114093452f5309
diff --cc configs/uniphier_v7_defconfig
index 03feb04b93,501d0ebdd5..b7b86b668c
--- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@@ -80,8 -78,11 +78,10 @@@ CONFIG_SNI_AVE=
  CONFIG_SPI=y
  CONFIG_DM_SPI=y
  CONFIG_UNIPHIER_SPI=y
+ CONFIG_TIMER=y
+ CONFIG_SPL_TIMER=y
  CONFIG_USB=y
  CONFIG_USB_XHCI_HCD=y
 -CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
  CONFIG_USB_DWC3=y