colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: PARTITION_UUIDS should be optional

Browse Source 
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 17f8cda505 ("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>
This commit is contained in:
AKASHI Takahiro
2022-04-19 10:01:56 +09:00
committed by Heinrich Schuchardt
parent c73a0709e4
commit 7a06fd7579
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/efi_loader/Kconfig
View File

@@ -15,7 +15,7 @@ config EFI_LOADER
depends on !EFI_APP depends on !EFI_APP
default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
select LIB_UUID select LIB_UUID
select PARTITION_UUIDS imply PARTITION_UUIDS
select HAVE_BLOCK_DEVICE select HAVE_BLOCK_DEVICE
select REGEX select REGEX
imply FAT imply FAT

9
lib/efi_loader/efi_device_path.c
View File

@@ -864,11 +864,16 @@ static void *dp_part_node(void *buf, struct blk_desc *desc, int part)
break; break;
case SIG_TYPE_GUID: case SIG_TYPE_GUID:
hddp->signature_type = 2; hddp->signature_type = 2;
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
/* info.uuid exists only with PARTITION_UUIDS */
if (uuid_str_to_bin(info.uuid, if (uuid_str_to_bin(info.uuid,
hddp->partition_signature, 1)) hddp->partition_signature,
UUID_STR_FORMAT_GUID)) {
log_warning( log_warning(
"Partition no. %d: invalid guid: %s\n", "Partition %d: invalid GUID %s\n",
part, info.uuid); part, info.uuid);
}
#endif
break; break;
} }