MX51: Register definitions cannot be included in board config file
authorStefano Babic <sbabic@denx.de>
Thu, 30 Sep 2010 11:11:57 +0000 (13:11 +0200)
committerStefano Babic <sbabic@denx.de>
Thu, 30 Sep 2010 12:42:14 +0000 (14:42 +0200)
Due to wrong dependencies, it is not possible to include imx_regs.h
inside the board configuration file.

Signed-off-by: Stefano Babic <sbabic@denx.de>
arch/arm/include/asm/arch-mx51/imx-regs.h

index 072ad0f6dd3f6eced3205984efd66882d2797ad0..3ddda401f318372b44c730c5894959e90930bcfe 100644 (file)
@@ -23,9 +23,6 @@
 #ifndef __ASM_ARCH_MXC_MX51_H__
 #define __ASM_ARCH_MXC_MX51_H__
 
-#define __REG(x)       (*((volatile u32 *)(x)))
-#define __REG16(x)     (*((volatile u16 *)(x)))
-#define __REG8(x)      (*((volatile u8 *)(x)))
 /*
  * IRAM
  */
 #define BOARD_REV_1_0           0x0
 #define BOARD_REV_2_0           0x1
 
-#ifndef __ASSEMBLY__
+#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+#include <asm/types.h>
+
+#define __REG(x)       (*((volatile u32 *)(x)))
+#define __REG16(x)     (*((volatile u16 *)(x)))
+#define __REG8(x)      (*((volatile u8 *)(x)))
 
 struct clkctl {
        u32     ccr;