diff options
| author | Stefano Babic <sbabic@denx.de> | 2010-09-30 13:11:57 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2010-09-30 14:42:14 +0200 |
| commit | f3554dfdd9a1efa9412f8a641c69bf4631240d33 (patch) | |
| tree | 0d014a1d720c836523cefb91cba869715e386b06 | |
| parent | 2f721d17339ee22bbc14fb0bb1dad20b82871923 (diff) | |
| download | u-boot-imx-f3554dfdd9a1efa9412f8a641c69bf4631240d33.zip u-boot-imx-f3554dfdd9a1efa9412f8a641c69bf4631240d33.tar.gz u-boot-imx-f3554dfdd9a1efa9412f8a641c69bf4631240d33.tar.bz2 | |
MX51: Register definitions cannot be included in board config file
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>
| -rw-r--r-- | arch/arm/include/asm/arch-mx51/imx-regs.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-mx51/imx-regs.h b/arch/arm/include/asm/arch-mx51/imx-regs.h index 072ad0f..3ddda40 100644 --- a/arch/arm/include/asm/arch-mx51/imx-regs.h +++ b/arch/arm/include/asm/arch-mx51/imx-regs.h @@ -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 */ @@ -207,7 +204,12 @@ #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; |