aboutsummaryrefslogtreecommitdiff
path: root/lib/efi_loader
diff options
context:
space:
mode:
Diffstat (limited to 'lib/efi_loader')
-rw-r--r--lib/efi_loader/efi_device_path.c5
-rw-r--r--lib/efi_loader/efi_disk.c2
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 d45985a760..3b267b713e 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 a50a46ce8d..7ea0334083 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;
}