From: Baikal Electronics <support@baikalelectronics.ru>
Date: Fri, 6 Oct 2023 16:42:36 +0000 (+0300)
Subject: Merge tag 'v2023.10' of https://github.com/u-boot/u-boot into testing_upstream
X-Git-Tag: baikal/mips/sdk6.2~4^2~3
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=28e9151d49f69196184acd160c7518bc91c3d016;p=uboot.git

Merge tag 'v2023.10' of https://github.com/u-boot/u-boot into testing_upstream

Prepare v2023.10
---

28e9151d49f69196184acd160c7518bc91c3d016
diff --cc drivers/cpu/Makefile
index c91df34a9c,d4bbf6fa5e..d1f1848db3
--- a/drivers/cpu/Makefile
+++ b/drivers/cpu/Makefile
@@@ -10,8 -10,8 +10,9 @@@ obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.
  obj-$(CONFIG_ARCH_IMX8) += imx8_cpu.o
  obj-$(CONFIG_ARCH_AT91) += at91_cpu.o
  obj-$(CONFIG_ARCH_MEDIATEK) += mtk_cpu.o
+ obj-$(CONFIG_CPU_IMX) += imx8_cpu.o
  obj-$(CONFIG_CPU_MPC83XX) += mpc83xx_cpu.o
  obj-$(CONFIG_CPU_RISCV) += riscv_cpu.o
 +obj-$(CONFIG_CPU_BAIKAL) += baikal_cpu.o
  obj-$(CONFIG_CPU_MICROBLAZE) += microblaze_cpu.o
  obj-$(CONFIG_SANDBOX) += cpu_sandbox.o
diff --cc drivers/i2c/Makefile
index 69a572b37e,d5b85f398d..fbcafbcdff
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@@ -18,6 -18,7 +18,7 @@@ obj-$(CONFIG_SYS_I2C_CADENCE) += i2c-cd
  obj-$(CONFIG_SYS_I2C_CA) += i2c-cortina.o
  obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o
  obj-$(CONFIG_SYS_I2C_DW) += designware_i2c.o
 -obj-$(CONFIG_SYS_I2C_DW_PCI) += designware_i2c_pci.o
++#obj-$(CONFIG_SYS_I2C_DW_PCI) += designware_i2c_pci.o
  obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o
  obj-$(CONFIG_SYS_I2C_IHS) += ihs_i2c.o
  obj-$(CONFIG_SYS_I2C_INTEL) += intel_i2c.o
diff --cc drivers/pci/Makefile
index 4dec3a4a41,a712a317a3..56a177726a
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -48,5 -48,7 +48,8 @@@ obj-$(CONFIG_PCI_BRCMSTB) += pcie_brcms
  obj-$(CONFIG_PCI_OCTEONTX) += pci_octeontx.o
  obj-$(CONFIG_PCIE_OCTEON) += pcie_octeon.o
  obj-$(CONFIG_PCIE_DW_SIFIVE) += pcie_dw_sifive.o
 +obj-$(CONFIG_PCIE_DW_GENERIC) += pcie_dw_generic.o
  obj-$(CONFIG_PCIE_UNIPHIER) += pcie_uniphier.o
+ obj-$(CONFIG_PCIE_XILINX_NWL) += pcie-xilinx-nwl.o
+ obj-$(CONFIG_PCIE_PLDA_COMMON) += pcie_plda_common.o
+ obj-$(CONFIG_PCIE_STARFIVE_JH7110) += pcie_starfive_jh7110.o
diff --cc tools/Makefile
index fa40652291,3d0c4b0dd6..6f6fe88403
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -113,7 -114,8 +114,8 @@@ dumpimage-mkimage-objs := aisimage.o 
  			imximage.o \
  			imx8image.o \
  			imx8mimage.o \
- 			lib/md5.o \
 -			kwbimage.o \
++#			kwbimage.o \
+ 			generated/lib/md5.o \
  			lpc32xximage.o \
  			mxsimage.o \
  			omapimage.o \