Merge tag 'xilinx-for-v2017.05' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / arch / arm / mach-uniphier / memconf.c

diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c
index 205ccf1c655d98af4e71a1f15c1e64b55b8ecce9..4ced2cbace03f4f736fdd7b0e094e11542457954 100644 (file)
--- a/arch/arm/mach-uniphier/memconf.c
+++ b/arch/arm/mach-uniphier/memconf.c
@@ -7,7 +7,7 @@
  */
 
 #include <common.h>
-#include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 
@@ -93,7 +93,7 @@ static int __uniphier_memconf_init(const struct uniphier_board_data *bd,
        }
 
        /* is sparse mem? */
-       if (bd->dram_ch[0].base + bd->dram_ch[0].size < bd->dram_ch[1].base)
+       if (bd->flags & UNIPHIER_BD_DRAM_SPARSE)
                val |= SG_MEMCONF_SPARSEMEM;
 
        if (!have_ch2)