From: Tom Rini <trini@konsulko.com>
Date: Mon, 7 Jul 2025 20:10:59 +0000 (-0600)
Subject: Merge branch 'next'
X-Git-Tag: v2025.10-rc1~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d0b8874fde96c88e866c1e5ae0018354b7cd7d6;p=thirdparty%2Fu-boot.git

Merge branch 'next'
---

6d0b8874fde96c88e866c1e5ae0018354b7cd7d6
diff --cc configs/mx6sabresd_defconfig
index 312af2f57fd,e8109fbe6c0..75a655a0e0d
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@@ -67,10 -65,11 +67,10 @@@ CONFIG_EFI_PARTITION=
  # CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd"
 -CONFIG_MULTI_DTB_FIT=y
  CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_SYS_MMC_ENV_DEV=1
+ CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+ CONFIG_ENV_MMC_DEVICE_INDEX=1
  CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  CONFIG_ARP_TIMEOUT=200
  CONFIG_BOUNCE_BUFFER=y