Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / common / env_mmc.c

diff --git a/common/env_mmc.c b/common/env_mmc.c
index 65aafa9cac26472abc4d9707e88d42361eadef5f..045428c6ec96038e8aec0ee9d15b3561219e0233 100644 (file)
--- a/common/env_mmc.c
+++ b/common/env_mmc.c
@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* #define DEBUG */
@@ -192,11 +192,12 @@ void env_relocate_spec(void)
        u32 offset1, offset2;
        int read1_fail = 0, read2_fail = 0;
        int crc1_ok = 0, crc2_ok = 0;
-       env_t *ep, *tmp_env1, *tmp_env2;
+       env_t *ep;
        int ret;
 
-       tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
-       tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
+       ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1);
+       ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1);
+
        if (tmp_env1 == NULL || tmp_env2 == NULL) {
                puts("Can't allocate buffers for environment\n");
                ret = 1;
@@ -266,8 +267,6 @@ err:
        if (ret)
                set_default_env(NULL);
 
-       free(tmp_env1);
-       free(tmp_env2);
 #endif
 }
 #else /* ! CONFIG_ENV_OFFSET_REDUND */