Merge branch 'upstream_testing' into baikal_mips_legacy_upstream

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/Makefile
Simple merge

diff --cc arch/mips/dts/Makefile
Simple merge

diff --cc arch/mips/lib/bootm.c
Simple merge

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
index 2cb6d23bf7044bac889740dc1b3bfb7d3e3775df,c274cda77c6abf2ca0946cb5f6d6f8d2688f0d39..b3f1c15a08114fd14a352b8f4e3c4d8d024293f6
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -53,5 -53,3 +53,4 @@@ obj-$(CONFIG_MACH_PIC32) += clk_pic32.
  obj-$(CONFIG_SANDBOX_CLK_CCF) += clk_sandbox_ccf.o
  obj-$(CONFIG_SANDBOX) += clk_sandbox.o
  obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
- obj-$(CONFIG_STM32H7) += clk_stm32h7.o
- obj-$(CONFIG_CLK_BAIKAL) += clk_baikal.o
++obj-$(CONFIG_CLK_BAIKAL) += clk_baikal.o

diff --cc drivers/cpu/Kconfig
index 9e3067ff748cf653dfe7013dbd6cdbed1655d3c6,3bf04105e5e957e4aa43a69c80b0653c606ad981..fa83d71354865cec3457f924405e720a3e215876
--- 1/drivers/cpu/Kconfig
--- 2/drivers/cpu/Kconfig
+++ b/drivers/cpu/Kconfig
@@@ -20,8 -20,10 +20,18 @@@ config CPU_RISC
        help
          Support CPU cores for RISC-V architecture.
  
++<<<<<<< HEAD
 +config CPU_BAIKAL
 +      bool "Enable Baikal-T1 CPU driver"
 +      depends on CPU
 +      help
 +        Support CPU cores for Baikal mips chips.
++=======
+ config CPU_MICROBLAZE
+       bool "Enable Microblaze CPU driver"
+       depends on CPU && MICROBLAZE
+       select DM_EVENT
+       select XILINX_MICROBLAZE0_PVR
+       help
+         Support CPU cores for Microblaze architecture.
++>>>>>>> upstream_testing

diff --cc drivers/cpu/Makefile
index 03a97aff49b4cf1bc141776495b4323cedb4afd5,3b38ba9c589e29d6d38440934468f97b3f2e10a3..c91df34a9c2d25d70acaffddc950245ce4dd0092
--- 1/drivers/cpu/Makefile
--- 2/drivers/cpu/Makefile
+++ b/drivers/cpu/Makefile
@@@ -9,7 -9,8 +9,9 @@@ obj-$(CONFIG_CPU) += cpu-uclass.
  obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.o
  obj-$(CONFIG_ARCH_IMX8) += imx8_cpu.o
  obj-$(CONFIG_ARCH_AT91) += at91_cpu.o
+ obj-$(CONFIG_ARCH_MEDIATEK) += mtk_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
Simple merge

diff --cc drivers/mtd/spi/spi-nor-core.c
Simple merge

diff --cc drivers/net/designware.c
index 7e0b7bfb637e0c25e1064d4f7a19dc9f28cefb95,e09ca3313dd3cbc4627094ff81b9676a78293276..29024cccc2f9dea9ee30afa5ccb483073eebd90e
--- 1/drivers/net/designware.c
--- 2/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@@ -237,10 -229,10 +229,10 @@@ static void tx_descs_init(struct dw_eth
        struct dmamacdescr *desc_p;
        u32 idx;
  
-       for (idx = 0; idx < CONFIG_TX_DESCR_NUM; idx++) {
+       for (idx = 0; idx < CFG_TX_DESCR_NUM; idx++) {
                desc_p = &desc_table_p[idx];
-               desc_p->dmamac_addr = virt_to_phys(&txbuffs[idx * CONFIG_ETH_BUFSIZE]);
 -              desc_p->dmamac_addr = (ulong)&txbuffs[idx * CFG_ETH_BUFSIZE];
 -              desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1];
++              desc_p->dmamac_addr = virt_to_phys(&txbuffs[idx * CFG_ETH_BUFSIZE]);
 +              desc_p->dmamac_next = virt_to_phys(&desc_table_p[idx + 1]);
  
  #if defined(CONFIG_DW_ALTDESCRIPTOR)
                desc_p->txrx_status &= ~(DESC_TXSTS_TXINT | DESC_TXSTS_TXLAST |
@@@ -285,11 -277,11 +277,10 @@@ static void rx_descs_init(struct dw_eth
         * GMAC data will be corrupted. */
        flush_dcache_range((ulong)rxbuffs, (ulong)rxbuffs + RX_TOTAL_BUFSIZE);
  
-       for (idx = 0; idx < CONFIG_RX_DESCR_NUM; idx++) {
+       for (idx = 0; idx < CFG_RX_DESCR_NUM; idx++) {
                desc_p = &desc_table_p[idx];
-               desc_p->dmamac_addr = virt_to_phys(&rxbuffs[idx * CONFIG_ETH_BUFSIZE]);
 -              desc_p->dmamac_addr = (ulong)&rxbuffs[idx * CFG_ETH_BUFSIZE];
 -              desc_p->dmamac_next = (ulong)&desc_table_p[idx + 1];
 -
++              desc_p->dmamac_addr = virt_to_phys(&rxbuffs[idx * CFG_ETH_BUFSIZE]);
 +              desc_p->dmamac_next = virt_to_phys(&desc_table_p[idx + 1]);
- 
                desc_p->dmamac_cntl =
                        (MAC_MAX_FRAME_SZ & DESC_RXCTRL_SIZE1MASK) |
                                      DESC_RXCTRL_RXCHAIN;

diff --cc drivers/net/designware.h
index 14cb81f7685f48dab82c702fe4e5fe3d60a7058e,9da4e902cb0d598849618fa18df9afb208158af0..78513cd2559a4f144341a924166769fed3184135
--- 1/drivers/net/designware.h
--- 2/drivers/net/designware.h
+++ b/drivers/net/designware.h
@@@ -248,12 -243,8 +243,11 @@@ struct dw_eth_dev 
  
        struct phy_device *phydev;
        struct mii_dev *bus;
 +      u32 flags;
 +#define DWMAC_PHY_RESET               1
 +#define DWMAC_PHY_RECONFIG    2
  };
  
- #ifdef CONFIG_DM_ETH
  int designware_eth_of_to_plat(struct udevice *dev);
  int designware_eth_probe(struct udevice *dev);
  extern const struct eth_ops designware_eth_ops;

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

diff --cc drivers/pci/Kconfig
index 43c88b68ba27f11d7d4c348ca5ee210722a0703e,ef328d26525b767904025896d5617268fd88a564..e2924eb9773bee066a354a1b8727e622261d1d6c
--- 1/drivers/pci/Kconfig
--- 2/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -121,14 -142,12 +142,18 @@@ config PCIE_DW_SIFIV
          Say Y here if you want to enable PCIe controller support on
          FU740.
  
 +config PCIE_DW_GENERIC
 +      bool "Enable generic DesignWare PCIe driver"
 +      help
 +        Say Y here if you want to enable PCIe controller support on
 +        DesignWare hardware.
 +
+ config SYS_FSL_PCI_VER_3_X
+       bool
+ 
  config PCIE_FSL
        bool "FSL PowerPC PCIe support"
+       select SYS_FSL_PCI_VER_3_X if ARCH_T2080 || ARCH_T4240
        help
          Say Y here if you want to enable PCIe controller support on FSL
          PowerPC MPC85xx, MPC86xx, B series, P series and T series SoCs.

diff --cc drivers/pci/Makefile
Simple merge

diff --cc drivers/watchdog/designware_wdt.c
Simple merge

diff --cc env/flags.c
Simple merge

diff --cc tools/Makefile
Simple merge

diff --cc tools/image-host.c
index e3ea82a1e2ff76b18e1200eb1eb1b31518945d36,4a24dee8153c0514f18dcafad4b15c913c919e8d..b695c8be030cff4a57db195b22fecd4fca8cfbae
--- 1/tools/image-host.c
--- 2/tools/image-host.c
+++ b/tools/image-host.c
@@@ -14,13 -14,9 +14,11 @@@
  #include <image.h>
  #include <version.h>
  
 +/*
  #include <openssl/pem.h>
  #include <openssl/evp.h>
 +*/
  
- #define IMAGE_PRE_LOAD_PATH                             "/image/pre-load/sig"
- 
  /**
   * fit_set_hash_value - set hash value in requested has node
   * @fit: pointer to the FIT format image header