x86: kconfig: Imply HAVE_INTEL_ME in the platform Kconfig

[u-boot] / common / env_fat.c

diff --git a/common/env_fat.c b/common/env_fat.c
index e4c848935ad19d7cac64d07102e7ebe39841b58b..b51c920cd45fdc01cda9d5ad353c184b73f8e395 100644 (file)
--- a/common/env_fat.c
+++ b/common/env_fat.c
@@ -13,6 +13,7 @@
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <search.h>
 #include <errno.h>
 #include <fat.h>
@@ -37,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;
@@ -47,24 +48,24 @@ int saveenv(void)
        if (err)
                return err;
 
-       part = get_device_and_partition(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;
 
-       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);
+                      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;
        }
 
@@ -76,28 +77,28 @@ 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,
-                                       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;
 
-       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);
+                      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;
        }