efi_loader: PARTITION_UUIDS should be optional

In the current implementation, partition table support (either GPT or DOS)
is not mandatory. So CONFIG_PARTITION_UUIDS should not be enabled
(selected) unconditionally.

Fixes: commit 17f8cda505e3 ("efi_loader: set partition GUID in device path for SIG_TYPE_GUID")
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index d50cd2563d3df18005e8c1359257095b0fb20be1..bc518d7a413bf4f26b50d91cd0fdec47b2cb4d26 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -15,7 +15,7 @@ config EFI_LOADER
        depends on !EFI_APP
        default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
        select LIB_UUID
-       select PARTITION_UUIDS
+       imply PARTITION_UUIDS
        select HAVE_BLOCK_DEVICE
        select REGEX
        imply FAT

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 0542aaae16c719d5293f33475931effd48d0a9f6..50a988c56136fb691f362b12ef0fa8f5392cd56d 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -864,11 +864,16 @@ static void *dp_part_node(void *buf, struct blk_desc *desc, int part)
                        break;
                case SIG_TYPE_GUID:
                        hddp->signature_type = 2;
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
+                       /* info.uuid exists only with PARTITION_UUIDS */
                        if (uuid_str_to_bin(info.uuid,
-                                           hddp->partition_signature, 1))
+                                           hddp->partition_signature,
+                                           UUID_STR_FORMAT_GUID)) {
                                log_warning(
-                                       "Partition no. %d: invalid guid: %s\n",
+                                       "Partition %d: invalid GUID %s\n",
                                        part, info.uuid);
+                       }
+#endif
                        break;
                }