diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2017-01-27 11:00:42 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-28 08:48:03 -0500 |
| commit | b331cd6204ffdc568cd6c06bd18e72aa9bc61f22 (patch) | |
| tree | 3f50e6283579b3a6a063befd7bc5698ecdfc6954 /disk/part.c | |
| parent | 4ac96345b22cc8dcd299c6012cc5c80e44058bae (diff) | |
| download | u-boot-b331cd6204ffdc568cd6c06bd18e72aa9bc61f22.tar.gz | |
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 <patrick.delaunay@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'disk/part.c')
| -rw-r--r-- | disk/part.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/disk/part.c b/disk/part.c index cd14e988ed..cd447024c0 100644 --- a/disk/part.c +++ b/disk/part.c @@ -299,7 +299,7 @@ int part_get_info(struct blk_desc *dev_desc, int part, #ifdef HAVE_BLOCK_DEVICE struct part_driver *drv; -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) /* The common case is no UUID support */ info->uuid[0] = 0; #endif @@ -416,7 +416,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, info->bootable = 0; strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "Sandbox host"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif #ifdef CONFIG_PARTITION_TYPE_GUID @@ -442,7 +442,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, memset(info, 0, sizeof(*info)); strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "UBI"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif return 0; @@ -526,7 +526,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, info->bootable = 0; strcpy((char *)info->type, BOOT_PART_TYPE); strcpy((char *)info->name, "Whole Disk"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif #ifdef CONFIG_PARTITION_TYPE_GUID |