From b331cd6204ffdc568cd6c06bd18e72aa9bc61f22 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 27 Jan 2017 11:00:42 +0100 Subject: cmd, disk: convert CONFIG_PARTITION_UUIDS, CMD_PART and CMD_GPT We convert CONFIG_PARTITION_UUIDS to Kconfig first. But in order to cleanly update all of the config files we must also update CMD_PART and CMD_GPT to also be in Kconfig in order to avoid complex logic elsewhere to update all of the config files. Signed-off-by: Patrick Delaunay Signed-off-by: Patrick Delaunay Signed-off-by: Tom Rini --- disk/part_efi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disk/part_efi.c') diff --git a/disk/part_efi.c b/disk/part_efi.c index f1b7116..b5928e5 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -279,7 +279,7 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, print_efiname(&gpt_pte[part - 1])); strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(&gpt_pte[part - 1]); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) uuid_bin_to_str(gpt_pte[part - 1].unique_partition_guid.b, info->uuid, UUID_STR_FORMAT_GUID); #endif @@ -397,7 +397,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, le64_to_cpu(gpt_h->last_usable_lba); int i, k; size_t efiname_len, dosname_len; -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) char *str_uuid; unsigned char *bin_uuid; #endif @@ -452,7 +452,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, &PARTITION_BASIC_DATA_GUID, 16); #endif -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) str_uuid = partitions[i].uuid; bin_uuid = gpt_e[i].unique_partition_guid.b; -- cgit v1.1