[U-Boot-Users] [PATCH] fix imx-regs.h compilation with ELDK-4.0

[Andrew Dyer]

Compiling cpu/arm920t/imx/generic.c under ELDK-4.0 fails with a bunch
of invalid lvalue errors.    The patch below fixes this.

Signed-off-by: Andrew Dyer <amdyer at gmail.com>

diff --git a/include/asm-arm/arch-imx/imx-regs.h
b/include/asm-arm/arch-imx/imx-regs.h
index 318de22..9ec6d03 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/include/asm-arm/arch-imx/imx-regs.h
@@ -8,9 +8,7 @@

 # ifndef __ASSEMBLY__
 #  define __REG(x)     (*((volatile u32 *)(x)))
-# define __REG2(x,y)   \
-       ( __builtin_constant_p(y) ? (__REG((x) + (y))) \
-                         : (*(volatile u32 *)((u32)&__REG(x) + (y))) )
+#  define __REG2(x,y)  (*(volatile u32 *)((u32)&__REG(x) + (y)))
 # else
 #  define __REG(x) (x)
 #  define __REG2(x,y) ((x)+(y))


-- 
Hardware, n.:
        The parts of a computer system that can be kicked.