diff options
| author | Tom Rini <[email protected]> | 2022-11-08 09:45:10 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-08 09:45:10 -0500 |
| commit | 77b5cc2948f5d93fe3d275302f596ffd8701a875 (patch) | |
| tree | 703dfe2a0ebb2eacb241c19b99c96665a2d66811 /lib | |
| parent | 88bd8ee106591eb900561715c44ad04441afc0e3 (diff) | |
| parent | 168a0e45fcf49194fca55795f84a844f16b480f6 (diff) | |
Merge tag 'dm-pull-7nov22' of https://source.denx.de/u-boot/custodians/u-boot-dm
sandbox UCLASS_HOST
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 5 | ||||
| -rw-r--r-- | lib/efi_loader/efi_disk.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index d45985a7601..3b267b713e9 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -17,7 +17,6 @@ #include <nvme.h> #include <efi_loader.h> #include <part.h> -#include <sandboxblockdev.h> #include <uuid.h> #include <asm-generic/unaligned.h> #include <linux/compat.h> /* U16_MAX */ @@ -556,7 +555,7 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev) sizeof(struct efi_device_path_nvme); #endif #ifdef CONFIG_SANDBOX - case UCLASS_ROOT: + case UCLASS_HOST: /* * Sandbox's host device will be represented * as vendor device with extra one byte for @@ -633,7 +632,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) case UCLASS_BLK: switch (dev->parent->uclass->uc_drv->id) { #ifdef CONFIG_SANDBOX - case UCLASS_ROOT: { + case UCLASS_HOST: { /* stop traversing parents at this point: */ struct efi_device_path_vendor *dp; struct blk_desc *desc = dev_get_uclass_plat(dev); diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index a50a46ce8d0..7ea0334083f 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -555,7 +555,7 @@ static int efi_disk_create_raw(struct udevice *dev) if (ret == EFI_NOT_READY) log_notice("Disk %s not ready\n", dev->name); else - log_err("Adding disk for %s failed\n", dev->name); + log_err("Adding disk for %s failed (err=%ld/%#lx)\n", dev->name, ret, ret); return -1; } |