Merge branch 'master' of git://git.denx.de/u-boot-arc

arch/arc/include/asm/posix_types.h

@@ -16,7 +16,11 @@ typedef int			__kernel_pid_t;
 typedef unsigned short		__kernel_ipc_pid_t;
 typedef unsigned short		__kernel_uid_t;
 typedef unsigned short		__kernel_gid_t;
+#ifdef __GNUC__
+typedef __SIZE_TYPE__		__kernel_size_t;
+#else
 typedef unsigned int		__kernel_size_t;
+#endif
 typedef int			__kernel_ssize_t;
 typedef int			__kernel_ptrdiff_t;
 typedef long			__kernel_time_t;

board/synopsys/axs101/nand.c

@@ -62,8 +62,10 @@ struct nand_bd {
 	uint32_t buffer_ptr1;	/* DES3 */
 };
 
-#define NAND_REG_WRITE(r, v)	writel(v, CONFIG_SYS_NAND_BASE + r)
-#define NAND_REG_READ(r)	readl(CONFIG_SYS_NAND_BASE + r)
+#define NAND_REG_WRITE(r, v)	\
+	writel(v, (volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
+#define NAND_REG_READ(r)		\
+	readl((const volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
 
 static struct nand_bd *bd;	/* DMA buffer descriptors	*/