From 952018117ab4daff5fb4500d5ce0143678473ca4 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Oct 2022 19:47:17 -0600 Subject: dm: sandbox: Switch over to using the new host uclass Update the sandbox implementation to use UCLASS_HOST and adjust all the pieces to continue to work: - Update the 'host' command to use the new API - Replace various uses of UCLASS_ROOT with UCLASS_HOST - Disable test_eficonfig since it doesn't work (this should have a unit test to allow this to be debugged) - Update the blk test to use the new API - Drop the old header file Unfortunately it does not seem to be possible to split this change up further. Signed-off-by: Simon Glass --- lib/efi_loader/efi_device_path.c | 5 ++--- lib/efi_loader/efi_disk.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib') 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 #include #include -#include #include #include #include /* 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; } -- cgit v1.2.3