Merge patch series "Consistent Kconfig environment options CONFIG_ENV_ prefix"

Marek Vasut <marek.vasut+renesas@mailbox.org> says:

Rename the environment related variables and add ENV_ prefix, so that
all configuration options which are related to environment would have
an CONFIG_ENV_ prefix. No functional change.

Link: https://lore.kernel.org/r/20250609192701.20260-1-marek.vasut+renesas@mailbox.org

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

diff --cc boot/Kconfig
Simple merge

diff --cc configs/SBx81LIFKW_defconfig
Simple merge

diff --cc configs/SBx81LIFXCAT_defconfig
Simple merge

diff --cc configs/amd_versal2_virt_defconfig
Simple merge

diff --cc configs/brcp150_defconfig
Simple merge

diff --cc configs/brcp170_defconfig
Simple merge

diff --cc configs/brcp1_1r_defconfig
Simple merge

diff --cc configs/brcp1_1r_switch_defconfig
Simple merge

diff --cc configs/brcp1_2r_defconfig
Simple merge

diff --cc configs/brsmarc2_defconfig
Simple merge

diff --cc configs/colibri_t20_defconfig
Simple merge

diff --cc configs/dragonboard410c_defconfig
Simple merge

diff --cc configs/guruplug_defconfig
Simple merge

diff --cc configs/harmony_defconfig
Simple merge

diff --cc configs/hmibsc_defconfig
Simple merge

diff --cc configs/ib62x0_defconfig
Simple merge

diff --cc configs/imx28_btt3_defconfig
index a84327d,0000000..07c805f
mode 100644,000000..100644
--- 1/configs/imx28_btt3_defconfig
--- /dev/null
+++ b/configs/imx28_btt3_defconfig
@@@ -1,140 -1,0 +1,140 @@@
- CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 +CONFIG_ARM=y
 +CONFIG_SPL_SYS_THUMB_BUILD=y
 +CONFIG_ARCH_MX28=y
 +CONFIG_TEXT_BASE=0x40002000
 +CONFIG_SYS_MALLOC_F_LEN=0x8000
 +CONFIG_SPL_GPIO=y
 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_SF_DEFAULT_SPEED=40000000
 +CONFIG_IMX_CONFIG=""
 +CONFIG_DM_GPIO=y
 +CONFIG_SPL_DM_SPI=y
 +CONFIG_DEFAULT_DEVICE_TREE="nxp/mxs/imx28-btt3-1"
 +CONFIG_TARGET_BTT=y
 +CONFIG_SPL_MXS_PMU_MINIMAL_VDD5V_CURRENT=y
 +CONFIG_SPL_MXS_PMU_DISABLE_BATT_CHARGE=y
 +# CONFIG_SPL_MXS_PMU_ENABLE_4P2_LINEAR_REGULATOR is not set
 +CONFIG_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x80000
 +CONFIG_MULTI_DTB_FIT_USER_DEF_ADDR=0x43000000
 +CONFIG_SPL_MMC=y
 +CONFIG_SPL_SERIAL=y
 +CONFIG_SPL_STACK=0x20000
 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
 +CONFIG_SPL_TEXT_BASE=0x1000
 +CONFIG_SYS_LOAD_ADDR=0x42000000
 +CONFIG_SF_DEFAULT_BUS=2
 +CONFIG_SPL_SIZE_LIMIT=0xa000
 +CONFIG_SPL=y
 +CONFIG_ENV_OFFSET_REDUND=0x90000
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
 +CONFIG_SPL_SPI=y
 +CONFIG_SPL_PAYLOAD="u-boot.img"
 +CONFIG_HAS_BOARD_SIZE_LIMIT=y
 +CONFIG_BOARD_SIZE_LIMIT=458752
 +CONFIG_TIMESTAMP=y
 +CONFIG_FIT=y
 +# CONFIG_BOOTMETH_EXTLINUX is not set
 +# CONFIG_BOOTMETH_VBE is not set
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="console=ttyAMA0,115200n8"
 +CONFIG_USE_BOOTCOMMAND=y
 +CONFIG_BOOTCOMMAND="run ${bootpri} ; run ${bootsec}"
 +CONFIG_USE_PREBOOT=y
 +CONFIG_PREBOOT="run prebootcmd"
 +CONFIG_BOARD_EARLY_INIT_F=y
 +CONFIG_BOARD_LATE_INIT=y
 +CONFIG_SPL_NO_BSS_LIMIT=y
 +CONFIG_SPL_BOARD_INIT=y
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 +CONFIG_SPL_HAVE_INIT_STACK=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x0
 +CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG=y
 +CONFIG_SPL_DMA=y
 +CONFIG_SPL_MMC_TINY=y
 +CONFIG_SPL_DM_SPI_FLASH=y
 +CONFIG_SPL_OS_BOOT=y
 +CONFIG_SPL_PAYLOAD_ARGS_ADDR=0x44000000
 +CONFIG_SPL_FALCON_BOOT_MMCSD=y
 +CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x800
 +CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x400
 +CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x40
 +CONFIG_SPL_SPI_LOAD=y
 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000
 +CONFIG_SYS_SPI_KERNEL_OFFS=0x100000
 +CONFIG_SYS_SPI_ARGS_OFFS=0x80000
 +CONFIG_SYS_SPI_ARGS_SIZE=0x8000
 +CONFIG_SPL_YMODEM_SUPPORT=y
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_MAXARGS=32
 +CONFIG_CMD_SPL=y
 +CONFIG_CMD_ASKENV=y
 +CONFIG_CMD_GREPENV=y
 +CONFIG_CMD_DM=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_MTD=y
 +# CONFIG_CMD_PINMUX is not set
 +CONFIG_CMD_SPI=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_CACHE=y
 +CONFIG_CMD_REGULATOR=y
 +CONFIG_CMD_EXT4=y
 +CONFIG_CMD_FS_GENERIC=y
 +CONFIG_CMD_MTDPARTS=y
 +CONFIG_DOS_PARTITION=y
 +CONFIG_OF_CONTROL=y
 +CONFIG_SPL_OF_CONTROL=y
 +CONFIG_OF_BOARD=y
 +CONFIG_OF_LIST="nxp/mxs/imx28-btt3-0 nxp/mxs/imx28-btt3-1 nxp/mxs/imx28-btt3-2"
 +CONFIG_MULTI_DTB_FIT_GZIP=y
 +CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 +CONFIG_MULTI_DTB_FIT=y
 +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent interrupts"
 +CONFIG_SPL_OF_PLATDATA=y
 +# CONFIG_SPL_OF_PLATDATA_PARENT is not set
 +CONFIG_ENV_OVERWRITE=y
 +CONFIG_ENV_IS_IN_SPI_FLASH=y
++CONFIG_ENV_REDUNDANT=y
 +CONFIG_USE_BOOTFILE=y
 +CONFIG_BOOTFILE="uImage"
 +CONFIG_USE_HOSTNAME=y
 +CONFIG_HOSTNAME="btt3"
 +CONFIG_NET_RANDOM_ETHADDR=y
 +CONFIG_SPL_DM=y
 +CONFIG_DEVRES=y
 +CONFIG_MXS_GPIO=y
 +CONFIG_SUPPORT_EMMC_BOOT=y
 +CONFIG_MMC_MXS=y
 +CONFIG_MTD=y
 +CONFIG_DM_MTD=y
 +CONFIG_DM_SPI_FLASH=y
 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y
 +CONFIG_SPI_FLASH_ISSI=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 +CONFIG_SPI_FLASH_MTD=y
 +CONFIG_PHYLIB=y
 +CONFIG_PHY_ADDR_ENABLE=y
 +CONFIG_PHY_ADDR=1
 +CONFIG_PHY_FIXED=y
 +CONFIG_FEC_MXC=y
 +CONFIG_MII=y
 +CONFIG_PINCTRL=y
 +CONFIG_PINCTRL_MXS=y
 +CONFIG_DM_REGULATOR=y
 +CONFIG_DM_REGULATOR_FIXED=y
 +CONFIG_DM_REGULATOR_GPIO=y
 +CONFIG_SPECIFY_CONSOLE_INDEX=y
 +CONFIG_DM_SERIAL=y
 +CONFIG_SPI=y
 +CONFIG_DM_SPI=y
 +CONFIG_MXS_SPI=y
 +CONFIG_SPL_CRC8=y
 +# CONFIG_SPL_OF_LIBFDT is not set

diff --cc configs/imx8mn_var_som_defconfig
Simple merge

diff --cc configs/imx91_11x11_evk_defconfig
Simple merge

diff --cc configs/imx91_11x11_evk_inline_ecc_defconfig
Simple merge

diff --cc configs/jaguar-rk3588_defconfig
Simple merge

diff --cc configs/mot_defconfig
Simple merge

diff --cc configs/mvebu_espressobin_ultra-88f3720_defconfig
Simple merge

diff --cc configs/nanopc-t4-rk3399_defconfig
index 40e9987,677042f..b0e05d3
--- 1/configs/nanopc-t4-rk3399_defconfig
--- 2/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@@ -33,10 -30,9 +33,10 @@@ CONFIG_CMD_TIME=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_MMC=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
 +CONFIG_SPL_ROCKCHIP_IODOMAIN=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SDHCI=y

diff --cc configs/nanopi-m4-2gb-rk3399_defconfig
Simple merge

diff --cc configs/nanopi-m4-rk3399_defconfig
Simple merge

diff --cc configs/nanopi-m4b-rk3399_defconfig
Simple merge

diff --cc configs/nanopi-neo4-rk3399_defconfig
index c0aedd5,efd4508..689b53e
--- 1/configs/nanopi-neo4-rk3399_defconfig
--- 2/configs/nanopi-neo4-rk3399_defconfig
+++ b/configs/nanopi-neo4-rk3399_defconfig
@@@ -31,10 -28,9 +31,10 @@@ CONFIG_CMD_TIME=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_MMC=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
 +CONFIG_SPL_ROCKCHIP_IODOMAIN=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SDHCI=y

diff --cc configs/nanopi-r4s-rk3399_defconfig
index 3ce9bad,337097f..b0951c4
--- 1/configs/nanopi-r4s-rk3399_defconfig
--- 2/configs/nanopi-r4s-rk3399_defconfig
+++ b/configs/nanopi-r4s-rk3399_defconfig
@@@ -31,10 -28,9 +31,10 @@@ CONFIG_CMD_TIME=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_MMC=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
 +CONFIG_SPL_ROCKCHIP_IODOMAIN=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SDHCI=y

diff --cc configs/nas220_defconfig
Simple merge

diff --cc configs/paz00_defconfig
Simple merge

diff --cc configs/picasso_defconfig
Simple merge

diff --cc configs/puma-rk3399_defconfig
Simple merge

diff --cc configs/ringneck-px30_defconfig
Simple merge

diff --cc configs/sam9x75_curiosity_mmc_defconfig
index 76b8544,0000000..5688a65
mode 100644,000000..100644
--- 1/configs/sam9x75_curiosity_mmc_defconfig
--- /dev/null
+++ b/configs/sam9x75_curiosity_mmc_defconfig
@@@ -1,73 -1,0 +1,73 @@@
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_AT91=y
 +CONFIG_TEXT_BASE=0x23f00000
 +CONFIG_SYS_MALLOC_LEN=0x81000
 +CONFIG_SYS_MALLOC_F_LEN=0x12000
 +CONFIG_TARGET_SAM9X75_CURIOSITY=y
 +CONFIG_ATMEL_LEGACY=y
 +CONFIG_NR_DRAM_BANKS=8
 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20015f00
 +CONFIG_ENV_SIZE=0x4000
 +CONFIG_DM_GPIO=y
 +CONFIG_DEFAULT_DEVICE_TREE="microchip/at91-sam9x75_curiosity"
 +CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_SYS_LOAD_ADDR=0x22000000
 +CONFIG_DEBUG_UART_BASE=0xfffff200
 +CONFIG_DEBUG_UART_CLOCK=266666666
 +CONFIG_DEBUG_UART_BOARD_INIT=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_FIT=y
 +CONFIG_SD_BOOT=y
 +CONFIG_BOOTDELAY=3
 +CONFIG_USE_BOOTARGS=y
 +CONFIG_BOOTARGS="mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
 +CONFIG_USE_BOOTCOMMAND=y
 +CONFIG_BOOTCOMMAND="fatload mmc 0:1 0x21000000 at91-sam9x75_curiosity.dtb; fatload mmc 0:1 0x22000000 zImage; bootz 0x22000000 - 0x21000000"
 +CONFIG_SYS_CBSIZE=256
 +CONFIG_SYS_PBSIZE=281
 +CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 +# CONFIG_DISPLAY_BOARDINFO is not set
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="U-Boot> "
 +CONFIG_CMD_BOOTZ=y
 +CONFIG_CMD_CLK=y
 +CONFIG_CMD_DM=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_MMC=y
 +# CONFIG_CMD_SETEXPR is not set
 +CONFIG_BOOTP_BOOTFILESIZE=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +CONFIG_CMD_PING=y
 +CONFIG_CMD_HASH=y
 +CONFIG_HASH_VERIFY=y
 +CONFIG_CMD_FAT=y
 +CONFIG_OF_CONTROL=y
 +CONFIG_ENV_IS_IN_FAT=y
 +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
++CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 +CONFIG_CLK=y
 +CONFIG_CLK_CCF=y
 +CONFIG_CLK_AT91=y
 +CONFIG_AT91_GENERIC_CLK=y
 +CONFIG_AT91_SAM9X60_PLL=y
 +CONFIG_CPU=y
 +CONFIG_AT91_GPIO=y
 +CONFIG_DM_I2C=y
 +CONFIG_SYS_I2C_AT91=y
 +CONFIG_I2C_EEPROM=y
 +CONFIG_MICROCHIP_FLEXCOM=y
 +CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ATMEL=y
 +CONFIG_MTD=y
 +CONFIG_PINCTRL=y
 +CONFIG_PINCTRL_AT91=y
 +CONFIG_DM_SERIAL=y
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ATMEL_USART=y
 +CONFIG_TIMER=y
 +CONFIG_MCHP_PIT64B_TIMER=y
 +CONFIG_PHANDLE_CHECK_SEQ=y

diff --cc configs/seaboard_defconfig
Simple merge

diff --cc configs/star_defconfig
Simple merge

diff --cc configs/starfive_visionfive2_defconfig
Simple merge

diff --cc configs/stm32h747-disco_defconfig
index 8a0c724,0000000..5bb87ee
mode 100644,000000..100644
--- 1/configs/stm32h747-disco_defconfig
--- /dev/null
+++ b/configs/stm32h747-disco_defconfig
@@@ -1,35 -1,0 +1,35 @@@
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_ARM=y
 +CONFIG_ARCH_STM32=y
 +CONFIG_TEXT_BASE=0x08000000
 +CONFIG_SYS_MALLOC_LEN=0x100000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x24040000
 +CONFIG_ENV_SIZE=0x2000
 +CONFIG_DEFAULT_DEVICE_TREE="st/stm32h747i-disco"
 +CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_SYS_LOAD_ADDR=0xd0400000
 +CONFIG_STM32H7=y
 +CONFIG_TARGET_STM32H747_DISCO=y
 +CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_BOOTDELAY=3
 +CONFIG_AUTOBOOT_KEYED=y
 +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
 +CONFIG_AUTOBOOT_STOP_STR=" "
 +CONFIG_DEFAULT_FDT_FILE="stm32h747i-disco"
 +CONFIG_SYS_CBSIZE=256
 +CONFIG_SYS_PBSIZE=282
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_SYS_PROMPT="U-Boot > "
 +CONFIG_CMD_GPT=y
 +CONFIG_CMD_MMC=y
 +# CONFIG_CMD_SETEXPR is not set
 +CONFIG_CMD_CACHE=y
 +CONFIG_CMD_TIMER=y
 +CONFIG_CMD_EXT4_WRITE=y
 +# CONFIG_ISO_PARTITION is not set
 +CONFIG_OF_CONTROL=y
++CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 +CONFIG_NO_NET=y
 +CONFIG_STM32_SDMMC2=y
 +# CONFIG_PINCTRL_FULL is not set

diff --cc configs/stm32mp13_defconfig
Simple merge

diff --cc configs/stm32mp25_defconfig
Simple merge

diff --cc configs/syzygy_hub_defconfig
Simple merge

diff --cc configs/th1520_lpi4a_defconfig
Simple merge

diff --cc configs/tiger-rk3588_defconfig
Simple merge

diff --cc configs/topic_miami_defconfig
Simple merge

diff --cc configs/topic_miamilite_defconfig
Simple merge

diff --cc configs/topic_miamiplus_defconfig
Simple merge

diff --cc configs/toradex-smarc-imx8mp_defconfig
Simple merge

diff --cc configs/transformer_t20_defconfig
Simple merge

diff --cc configs/ventana_defconfig
Simple merge

diff --cc configs/xilinx_mbv32_defconfig
index c3f33d6,5bfa639..7dde2fc
--- 1/configs/xilinx_mbv32_defconfig
--- 2/configs/xilinx_mbv32_defconfig
+++ b/configs/xilinx_mbv32_defconfig
@@@ -29,9 -29,10 +29,9 @@@ CONFIG_SPL_MAX_SIZE=0x4000
  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
  CONFIG_SPL_HAVE_INIT_STACK=y
  CONFIG_SPL_SYS_MALLOC=y
 -CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
  # CONFIG_CMD_MII is not set
  CONFIG_CMD_TIMER=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_DM_MTD=y
  CONFIG_DEBUG_UART_ANNOUNCE=y

diff --cc configs/xilinx_mbv32_smode_defconfig
Simple merge

diff --cc configs/xilinx_mbv64_defconfig
index c2c677d,8848b8a..77fcf4d
--- 1/configs/xilinx_mbv64_defconfig
--- 2/configs/xilinx_mbv64_defconfig
+++ b/configs/xilinx_mbv64_defconfig
@@@ -30,9 -30,10 +30,9 @@@ CONFIG_SPL_MAX_SIZE=0x4000
  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
  CONFIG_SPL_HAVE_INIT_STACK=y
  CONFIG_SPL_SYS_MALLOC=y
 -CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
  # CONFIG_CMD_MII is not set
  CONFIG_CMD_TIMER=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_DM_MTD=y
  CONFIG_DEBUG_UART_ANNOUNCE=y

diff --cc configs/xilinx_mbv64_smode_defconfig
Simple merge

diff --cc configs/xilinx_versal_net_virt_defconfig
Simple merge

diff --cc configs/xilinx_versal_virt_defconfig
Simple merge

diff --cc configs/xilinx_zynq_virt_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_kria_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_virt_defconfig
Simple merge

diff --cc include/env_flags.h
Simple merge