Merge branch 'next'

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc .azure-pipelines.yml
Simple merge

diff --cc .gitlab-ci.yml
index 2ceeb947f7ce16ed86c9dfbbcf576a5485cece77,981b95c00d8df6c42d60e6062874ff8fc8909fb9..129234ba3db8865628914707b288ec40c732868d
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -225,9 -211,22 +211,9 @@@ Run binman, buildman, dtoc, Kconfig an
        ./tools/patman/patman test;
        make testconfig
  
 -Run tests for Nokia RX-51 (aka N900):
 -  extends: .testsuites
 -  script:
 -    - mkdir nokia_rx51_tmp;
 -      ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/;
 -      ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/;
 -      ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/;
 -      ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/;
 -      ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/;
 -      ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/;
 -      export PATH=/opt/gcc-13.2.0-nolibc/arm-linux-gnueabi/bin:$PATH;
 -      test/nokia_rx51_test.sh
 -
  # Check for any pylint regressions
  Run pylint:
-   stage: testsuites
+   extends: .testsuites
    script:
      - git config --global --add safe.directory "${CI_PROJECT_DIR}"
      - pip install -r test/py/requirements.txt

diff --cc Kconfig
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/imx8m/soc.c
Simple merge

diff --cc arch/arm/mach-imx/imx9/soc.c
Simple merge

diff --cc arch/sandbox/dts/test.dts
Simple merge

diff --cc board/starfive/visionfive2/starfive_visionfive2.c
index 19b7b4458bef929d068e22d80632c9af93cd76ef,05d8d2d657c03e8ae455dec76290953c91f4995e..78e118d5a05d27e51322e981fd2a3522c7a33dab
--- 1/board/starfive/visionfive2/starfive_visionfive2.c
--- 2/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@@ -90,10 -88,5 +90,10 @@@ void *board_fdt_blob_setup(int *err
                        return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
        }
  
-       return (ulong *)&_end;
+       return (ulong *)_end;
  }
 +
 +int ft_board_setup(void *blob, struct bd_info *bd)
 +{
 +      return fdt_fixup_memory(blob, 0x40000000, gd->ram_size);
 +}

diff --cc boot/expo_build.c
index 702bf498908211c9a98fbe357fb34a1790f18079,bb33cc2a33f438cd5212ed641930cf6193913766..910f1b479809ec91cbf4e238eda6b03fa54dacf8
--- 1/boot/expo_build.c
--- 2/boot/expo_build.c
+++ b/boot/expo_build.c
@@@ -280,9 -280,9 +280,9 @@@ static int menu_build(struct build_inf
  }
  
  /**
-  * menu_build() - Build an expo object and add it to a scene
+  * obj_build() - Build an expo object and add it to a scene
   *
 - * See doc/developer/expo.rst for a description of the format
 + * See doc/develop/expo.rst for a description of the format
   *
   * @info: Build information
   * @node: Node containing the object description

diff --cc common/dlmalloc.c
index dcecdb8623c814ba664f0c151e70bbdac8610501,ebf0f27e1657f4846dc8e988745e4757de607f2c..aa933bdf5778af38caa6a70a8e02415fd461007e
--- 1/common/dlmalloc.c
--- 2/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@@ -631,10 -618,9 +618,9 @@@ void mem_malloc_init(ulong start, ulon
  
        debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start,
              mem_malloc_end);
 -#ifdef CONFIG_SYS_MALLOC_CLEAR_ON_INIT
 +#if CONFIG_IS_ENABLED(SYS_MALLOC_CLEAR_ON_INIT)
        memset((void *)mem_malloc_start, 0x0, size);
  #endif
-       malloc_bin_reloc();
  }
  
  /* field-extraction macros */

diff --cc common/spl/spl_opensbi.c
Simple merge

diff --cc configs/imx6q_logic_defconfig
Simple merge

diff --cc configs/imx8mm_data_modul_edm_sbc_defconfig
Simple merge

diff --cc configs/imx8mn_beacon_2g_defconfig
Simple merge

diff --cc configs/imx8mn_beacon_defconfig
Simple merge

diff --cc configs/imx8mn_beacon_fspi_defconfig
Simple merge

diff --cc configs/imx8mp_beacon_defconfig
Simple merge

diff --cc configs/imx8mp_data_modul_edm_sbc_defconfig
Simple merge

diff --cc configs/imx8mp_dhcom_pdk2_defconfig
Simple merge

diff --cc configs/imx8mp_dhcom_pdk3_defconfig
Simple merge

diff --cc configs/sam9x60_curiosity_mmc1_defconfig
index 8f2f6d93e2d81285e3f8293bde10a55e4d04ce56,bb5e7d8ed089cd9171811c2289dabd3abdebb2d7..a24537018209b0c0fd2bb52574e04049dba260c5
--- 1/configs/sam9x60_curiosity_mmc1_defconfig
--- 2/configs/sam9x60_curiosity_mmc1_defconfig
+++ b/configs/sam9x60_curiosity_mmc1_defconfig
@@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity"
 -CONFIG_SYS_PROMPT="U-Boot> "
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_DEBUG_UART_BOARD_INIT=y

diff --cc configs/sam9x60_curiosity_mmc_defconfig
index 5999b5d614cafbc091b0986fe4ef4a6abc627f57,a0f819c0028517a5571148c6d540851c4591a79d..38ec241e7ddd7187d4119914d5312caef50c59f4
--- 1/configs/sam9x60_curiosity_mmc_defconfig
--- 2/configs/sam9x60_curiosity_mmc_defconfig
+++ b/configs/sam9x60_curiosity_mmc_defconfig
@@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity"
 -CONFIG_SYS_PROMPT="U-Boot> "
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_DEBUG_UART_BOARD_INIT=y

diff --cc configs/sam9x60ek_mmc_defconfig
index 06680ac94cb12741519b8d3cfa738aacd0cf7b91,c70c41c278ffab1b24f4ea9a58f521dcb5db3cbf..7cb4ab10853d9953c35f5e0e445f49c77fa4e259
--- 1/configs/sam9x60ek_mmc_defconfig
--- 2/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@@ -13,7 -13,9 +13,8 @@@ CONFIG_SF_DEFAULT_SPEED=5000000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
 -CONFIG_SYS_PROMPT="U-Boot> "
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_DEBUG_UART_BOARD_INIT=y

diff --cc configs/sam9x60ek_nandflash_defconfig
index fea200deda440b7c891e194cbcdac9f1d8dacc58,569b4e747cc7d60e0f5f3fd7532dae34fe38e634..4bfd0e807ed5bbf8b8a3c170066cfe2a837d090c
--- 1/configs/sam9x60ek_nandflash_defconfig
--- 2/configs/sam9x60ek_nandflash_defconfig
+++ b/configs/sam9x60ek_nandflash_defconfig
@@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf
  CONFIG_SF_DEFAULT_SPEED=50000000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
 -CONFIG_SYS_PROMPT="U-Boot> "
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_DEBUG_UART_BOARD_INIT=y

diff --cc configs/sam9x60ek_qspiflash_defconfig
index a1f8c9f902eaf9ce0396feb2f6d4d558e9d682a1,135cd787f9b390b0422fa54fd9694c4677a5b064..c7224dad460d8a6bd07eec82bd54ab092d07027b
--- 1/configs/sam9x60ek_qspiflash_defconfig
--- 2/configs/sam9x60ek_qspiflash_defconfig
+++ b/configs/sam9x60ek_qspiflash_defconfig
@@@ -12,7 -12,9 +12,8 @@@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000bf
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_DM_GPIO=y
  CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
 -CONFIG_SYS_PROMPT="U-Boot> "
  CONFIG_OF_LIBFDT_OVERLAY=y
+ CONFIG_DM_RESET=y
  CONFIG_DEBUG_UART_BASE=0xfffff200
  CONFIG_DEBUG_UART_CLOCK=200000000
  CONFIG_DEBUG_UART_BOARD_INIT=y

diff --cc configs/sandbox64_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/snow_defconfig
Simple merge

diff --cc configs/xilinx_versal_mini_defconfig
Simple merge

diff --cc configs/xilinx_versal_mini_emmc0_defconfig
Simple merge

diff --cc configs/xilinx_versal_mini_emmc1_defconfig
Simple merge

diff --cc configs/xilinx_versal_net_virt_defconfig
Simple merge

diff --cc configs/xilinx_versal_virt_defconfig
index b13beadf8c4e6ada176e153595430f58bb440206,89566c7d52c058942ddd478221526a80b61dc27e..388471dd9dbad4b82a69b2aa64253082533985aa
--- 1/configs/xilinx_versal_virt_defconfig
--- 2/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@@ -5,7 -5,9 +5,8 @@@ CONFIG_SYS_INIT_SP_BSS_OFFSET=157286
  CONFIG_ARCH_VERSAL=y
  CONFIG_TEXT_BASE=0x8000000
  CONFIG_SYS_MALLOC_F_LEN=0x100000
+ CONFIG_NR_DRAM_BANKS=36
  CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt"
 -CONFIG_SYS_PROMPT="Versal> "
  CONFIG_OF_LIBFDT_OVERLAY=y
  CONFIG_DM_RESET=y
  CONFIG_ENV_OFFSET_REDUND=0x7F00000

diff --cc doc/board/emulation/qemu-arm.rst
Simple merge

diff --cc doc/board/starfive/visionfive2.rst
Simple merge

diff --cc doc/usage/cmd/bootflow.rst
Simple merge

diff --cc drivers/mtd/nand/raw/atmel/nand-controller.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc include/env/ti/ti_common.env
Simple merge

diff --cc include/expo.h
Simple merge

diff --cc include/spl.h
Simple merge

diff --cc tools/docker/Dockerfile
Simple merge