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

Tom Rini
2 parents 141e1faec2 2fea4f5add
Showing 2 changed files Side-by-side Diff
arch/arc/include/asm/posix_types.h
board/synopsys/axs101/nand.c
@@ -16,7 +16,11 @@
 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;
@@ -62,8 +62,10 @@
 	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	*/
...	...	@@ -16,7 +16,11 @@
16	16	typedef unsigned short __kernel_ipc_pid_t;
17	17	typedef unsigned short __kernel_uid_t;
18	18	typedef unsigned short __kernel_gid_t;
	19	+#ifdef __GNUC__
	20	+typedef __SIZE_TYPE__ __kernel_size_t;
	21	+#else
19	22	typedef unsigned int __kernel_size_t;
	23	+#endif
20	24	typedef int __kernel_ssize_t;
21	25	typedef int __kernel_ptrdiff_t;
22	26	typedef long __kernel_time_t;
...	...	@@ -62,8 +62,10 @@
62	62	uint32_t buffer_ptr1; /* DES3 */
63	63	};
64	64
65		-#define NAND_REG_WRITE(r, v) writel(v, CONFIG_SYS_NAND_BASE + r)
66		-#define NAND_REG_READ(r) readl(CONFIG_SYS_NAND_BASE + r)
	65	+#define NAND_REG_WRITE(r, v) \
	66	+ writel(v, (volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
	67	+#define NAND_REG_READ(r) \
	68	+ readl((const volatile void __iomem *)(CONFIG_SYS_NAND_BASE + r))
67	69
68	70	static struct nand_bd bd; / DMA buffer descriptors */
69	71