rockchip: rk3399-gru: Include pinctrl and regulators in SPL

[J-u-boot.git] / fs / fs.c

diff --git a/fs/fs.c b/fs/fs.c
index 1afa0fbeaed9bebb5001c6f0587f94b7719ae57c..99ddcc5e37be590942c6e0689a4522076b814694 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
+#include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <div64.h>
@@ -553,7 +554,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset,
 
        lmb_dump_all();
 
-       if (lmb_alloc_addr(addr, read_len) == addr)
+       if (lmb_alloc_addr(addr, read_len, LMB_NONE) == addr)
                return 0;
 
        log_err("** Reading file would overwrite reserved memory **\n");
@@ -1001,6 +1002,9 @@ int fs_read_alloc(const char *fname, ulong size, uint align, void **bufp)
        char *buf;
        int ret;
 
+       if (!align)
+               align = ARCH_DMA_MINALIGN;
+
        buf = memalign(align, size + 1);
        if (!buf)
                return log_msg_ret("buf", -ENOMEM);