Merge branch 'master' into next

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

diff --cc .gitlab-ci.yml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc board/dhelectronics/dh_stm32mp1/board.c
Simple merge

diff --cc board/st/stm32mp1/stm32mp1.c
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc cmd/mvebu/bubt.c
Simple merge

diff --cc cmd/ximg.c
Simple merge

diff --cc common/Kconfig
Simple merge

diff --cc common/console.c
Simple merge

diff --cc configs/qemu-ppce500_defconfig
Simple merge

diff --cc configs/stm32mp15_defconfig
Simple merge

diff --cc disk/part.c
Simple merge

diff --cc doc/develop/index.rst
Simple merge

diff --cc doc/usage/index.rst
Simple merge

diff --cc drivers/nvme/nvme.c
Simple merge

diff --cc drivers/serial/serial_mxc.c
Simple merge

diff --cc include/asm-generic/global_data.h
Simple merge

diff --cc include/config_distro_bootcmd.h
Simple merge

diff --cc include/efi_loader.h
Simple merge

diff --cc include/image.h
Simple merge

diff --cc lib/efi_loader/Kconfig
Simple merge

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

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

diff --cc lib/efi_loader/efi_disk.c
index 819dcb4f131b25f653dc970ff0b7b0aa7a164fc4,5feeb52ccb49be596d0f28dc360891976968d2dc..e39968a3f37a9289a68edd8a62e2110220a8c277
--- 1/lib/efi_loader/efi_disk.c
--- 2/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@@ -761,52 -761,19 +761,69 @@@ efi_status_t efi_disk_init(void
        return EFI_SUCCESS;
  }
  
 +/**
 + * efi_disk_get_device_name() - get U-Boot device name associated with EFI handle
 + *
 + * @handle:   pointer to the EFI handle
 + * @buf:      pointer to the buffer to store the string
 + * @size:     size of buffer
 + * Return:    status code
 + */
 +efi_status_t efi_disk_get_device_name(const efi_handle_t handle, char *buf, int size)
 +{
 +      int count;
 +      int diskid;
 +      enum uclass_id id;
 +      unsigned int part;
 +      struct udevice *dev;
 +      struct blk_desc *desc;
 +      const char *if_typename;
 +      bool is_partition = false;
 +      struct disk_part *part_data;
 +
 +      if (!handle || !buf || !size)
 +              return EFI_INVALID_PARAMETER;
 +
 +      dev = handle->dev;
 +      id = device_get_uclass_id(dev);
 +      if (id == UCLASS_BLK) {
 +              desc = dev_get_uclass_plat(dev);
 +      } else if (id == UCLASS_PARTITION) {
 +              desc = dev_get_uclass_plat(dev_get_parent(dev));
 +              is_partition = true;
 +      } else {
 +              return EFI_INVALID_PARAMETER;
 +      }
 +      if_typename = blk_get_if_type_name(desc->if_type);
 +      diskid = desc->devnum;
 +
 +      if (is_partition) {
 +              part_data = dev_get_uclass_plat(dev);
 +              part = part_data->partnum;
 +              count = snprintf(buf, size, "%s %d:%d", if_typename, diskid, part);
 +      } else {
 +              count = snprintf(buf, size, "%s %d", if_typename, diskid);
 +      }
 +
 +      if (count < 0 || (count + 1) > size)
 +              return EFI_INVALID_PARAMETER;
 +
 +      return EFI_SUCCESS;
 +}
++
+ /**
+  * efi_disks_register() - ensure all block devices are available in UEFI
+  *
+  * The function probes all block devices. As we store UEFI variables on the
+  * EFI system partition this function has to be called before enabling
+  * variable services.
+  */
+ efi_status_t efi_disks_register(void)
+ {
+       struct udevice *dev;
+ 
+       uclass_foreach_dev_probe(UCLASS_BLK, dev) {
+       }
+ 
+       return EFI_SUCCESS;
+ }

diff --cc scripts/config_whitelist.txt
Simple merge