diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
| commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
| tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /common/env_fat.c | |
| parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
| parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/env_fat.c')
| -rw-r--r-- | common/env_fat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/env_fat.c b/common/env_fat.c index d79d864a0c1..75616d4c5b5 100644 --- a/common/env_fat.c +++ b/common/env_fat.c @@ -38,7 +38,7 @@ int env_init(void) int saveenv(void) { env_t env_new; - block_dev_desc_t *dev_desc = NULL; + struct blk_desc *dev_desc = NULL; disk_partition_t info; int dev, part; int err; @@ -48,13 +48,13 @@ int saveenv(void) if (err) return err; - part = get_device_and_partition(FAT_ENV_INTERFACE, + part = blk_get_device_part_str(FAT_ENV_INTERFACE, FAT_ENV_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) return 1; - dev = dev_desc->dev; + dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for saveenv **\n", FAT_ENV_INTERFACE, dev, part); @@ -77,18 +77,18 @@ int saveenv(void) void env_relocate_spec(void) { ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); - block_dev_desc_t *dev_desc = NULL; + struct blk_desc *dev_desc = NULL; disk_partition_t info; int dev, part; int err; - part = get_device_and_partition(FAT_ENV_INTERFACE, + part = blk_get_device_part_str(FAT_ENV_INTERFACE, FAT_ENV_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) goto err_env_relocate; - dev = dev_desc->dev; + dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for loading the env **\n", FAT_ENV_INTERFACE, dev, part); |