Merge branch 'next'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc configs/legoev3_defconfig
Simple merge

diff --cc configs/mx6sabresd_defconfig
index 312af2f,e8109fb..75a655a
--- 1/configs/mx6sabresd_defconfig
--- 2/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

diff --cc lib/efi_loader/efi_bootmgr.c
Simple merge