diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-27 01:48:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-31 15:22:56 (GMT) |
| commit | 43ba3c59cb6835f96fe32960cca9ef1406d0a626 (patch) | |
| tree | dc7353339835c1f67b5b79c4aad0f40e7e6a607e /common/env_fat.c | |
| parent | 3158eebd21f8c55b4d5a82161e0de805ae8f6f9c (diff) | |
| download | u-boot-fsl-qoriq-43ba3c59cb6835f96fe32960cca9ef1406d0a626.tar.xz | |
env: Migrate CONFIG_ENV_IS_IN_FAT options to Kconfig
We rename the various FAT_ENV_xxx options to CONFIG_ENV_FAT_xxx so that
they can be modified via Kconfig. Migrate all existing users to the new
values.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/env_fat.c')
| -rw-r--r-- | common/env_fat.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/common/env_fat.c b/common/env_fat.c index 75616d4..b51c920 100644 --- a/common/env_fat.c +++ b/common/env_fat.c @@ -48,8 +48,8 @@ int saveenv(void) if (err) return err; - part = blk_get_device_part_str(FAT_ENV_INTERFACE, - FAT_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, + CONFIG_ENV_FAT_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) return 1; @@ -57,15 +57,15 @@ int saveenv(void) 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); + CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } - err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, 0, sizeof(env_t), + err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t), &size); if (err == -1) { printf("\n** Unable to write \"%s\" from %s%d:%d **\n", - FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } @@ -82,8 +82,8 @@ void env_relocate_spec(void) int dev, part; int err; - part = blk_get_device_part_str(FAT_ENV_INTERFACE, - FAT_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, + CONFIG_ENV_FAT_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) goto err_env_relocate; @@ -91,14 +91,14 @@ void env_relocate_spec(void) 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); + CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } - err = file_fat_read(FAT_ENV_FILE, buf, CONFIG_ENV_SIZE); + err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE); if (err == -1) { printf("\n** Unable to read \"%s\" from %s%d:%d **\n", - FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } |