Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / drivers / mtd / nand / nand_util.c

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 12dd26a33fac3458d0fd89bcf2dcc91859f75895..71285b6669416b1402ebd8b03f7b9957b47a37a4 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -23,6 +23,7 @@
 #include <command.h>
 #include <watchdog.h>
 #include <malloc.h>
+#include <memalign.h>
 #include <div64.h>
 
 #include <asm/errno.h>
@@ -483,7 +484,7 @@ int nand_verify_page_oob(nand_info_t *nand, struct mtd_oob_ops *ops, loff_t ofs)
 
        memcpy(&vops, ops, sizeof(vops));
 
-       vops.datbuf = malloc(verlen);
+       vops.datbuf = memalign(ARCH_DMA_MINALIGN, verlen);
 
        if (!vops.datbuf)
                return -ENOMEM;
@@ -520,7 +521,7 @@ int nand_verify(nand_info_t *nand, loff_t ofs, size_t len, u_char *buf)
        int rval = 0;
        size_t verofs;
        size_t verlen = nand->writesize;
-       uint8_t *verbuf = malloc(verlen);
+       uint8_t *verbuf = memalign(ARCH_DMA_MINALIGN, verlen);
 
        if (!verbuf)
                return -ENOMEM;
@@ -839,7 +840,7 @@ int nand_torture(nand_info_t *nand, loff_t offset)
 
        patt_count = ARRAY_SIZE(patterns);
 
-       buf = malloc(nand->erasesize);
+       buf = malloc_cache_aligned(nand->erasesize);
        if (buf == NULL) {
                puts("Out of memory for erase block buffer\n");
                return -ENOMEM;