From: Stefano Babic Date: Thu, 30 Sep 2010 14:47:59 +0200 Subject: [U-Boot] [PATCH 09/10] MX51: Register definitions cannot be included in board config file In-Reply-To: <1285850880-13362-8-git-send-email-sbabic@denx.de> References: <1285850880-13362-1-git-send-email-sbabic@denx.de> <1285850880-13362-2-git-send-email-sbabic@denx.de> <1285850880-13362-3-git-send-email-sbabic@denx.de> <1285850880-13362-4-git-send-email-sbabic@denx.de> <1285850880-13362-5-git-send-email-sbabic@denx.de> <1285850880-13362-6-git-send-email-sbabic@denx.de> <1285850880-13362-7-git-send-email-sbabic@denx.de> <1285850880-13362-8-git-send-email-sbabic@denx.de> Message-ID: <1285850880-13362-9-git-send-email-sbabic@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Due to wrong dependencies, it is not possible to include imx_regs.h inside the board configuration file. Signed-off-by: Stefano Babic --- 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 + +#define __REG(x) (*((volatile u32 *)(x))) +#define __REG16(x) (*((volatile u16 *)(x))) +#define __REG8(x) (*((volatile u8 *)(x))) struct clkctl { u32 ccr; -- 1.6.3.3