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_dos.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_dos.c')
| -rw-r--r-- | disk/part_dos.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disk/part_dos.c b/disk/part_dos.c index ed78334a9d..c77d881560 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -189,7 +189,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, return -1; } -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) if (!ext_part_sector) disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]); #endif @@ -214,7 +214,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, /* sprintf(info->type, "%d, pt->sys_ind); */ strcpy((char *)info->type, "U-Boot"); info->bootable = is_bootable(pt); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) sprintf(info->uuid, "%08x-%02x", disksig, part_num); #endif return 0; @@ -249,7 +249,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc, info->blksz = DOS_PART_DEFAULT_SECTOR; info->bootable = 0; strcpy((char *)info->type, "U-Boot"); -#ifdef CONFIG_PARTITION_UUIDS +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) info->uuid[0] = 0; #endif return 0; |