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

Prepare v2023.10

diff --cc boot/image-board.c
Simple merge

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/clk/Kconfig
Simple merge

diff --cc drivers/clk/Makefile
Simple merge

diff --cc drivers/cpu/Kconfig
Simple merge

diff --cc drivers/cpu/Makefile
index c91df34a9c2d25d70acaffddc950245ce4dd0092,d4bbf6fa5e055937843ab3cc86ae07b12165ef83..d1f1848db33f2f702864a9f67494bcd1944ce454
--- 1/drivers/cpu/Makefile
--- 2/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/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/i2c/Makefile
index 69a572b37ef732c65254a6d66d26dea001d00f77,d5b85f398db31e4f371e47b18ea6e04754753ce5..fbcafbcdff535028d436d93a17af8ce75b1f777c
--- 1/drivers/i2c/Makefile
--- 2/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/mtd/spi/spi-nor-core.c
Simple merge

diff --cc drivers/net/phy/phy.c
Simple merge

diff --cc drivers/pci/Kconfig
Simple merge

diff --cc drivers/pci/Makefile
index 4dec3a4a419751d7f521d72bf2d860a944569f60,a712a317a398a079555ed68d700ea5d973bfca10..56a177726a75a560ac911233e58ebcc7c888a74f
--- 1/drivers/pci/Makefile
--- 2/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 fa406522917431068c4b5543bce6662ac608b03c,3d0c4b0dd6a31caa78962149a20d7de8f14e0520..6f6fe884039620eb903adfafd42ee7432f31be5d
--- 1/tools/Makefile
--- 2/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 \