diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2022-04-19 10:01:56 +0900 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2022-04-23 22:05:34 +0200 |
| commit | 7a06fd75797d002a0201fd4e3e0de3234a62ba3c (patch) | |
| tree | 7581bb635e4a1f3165ef5db0c20883a0b564bce3 /lib | |
| parent | c73a0709e4a7d12107ce957105f694fdd6b7f8b6 (diff) | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/Kconfig | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index d50cd2563d..bc518d7a41 100644 --- 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 0542aaae16..50a988c561 100644 --- 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; } |